diff options
| author | Marcel Telka <marcel@telka.sk> | 2024-05-17 21:01:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-17 12:13:18 -0700 |
| commit | 0f063b6c766fc98124f60b6b0f8424142641ff88 (patch) | |
| tree | e4b2fa8aa415d32167bbf15d19677b4d6c16385d /mergetools/vimdiff | |
| parent | d8ab1d464d07baa30e5a180eb33b3f9aa5c93adf (diff) | |
| download | git-0f063b6c766fc98124f60b6b0f8424142641ff88.tar.gz | |
Switch grep from non-portable BRE to portable ERE
This makes the grep usage fully POSIX compliant. The ability to
enable ERE features in BRE using backslash is a GNU extension.
Signed-off-by: Marcel Telka <marcel@telka.sk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
| -rw-r--r-- | mergetools/vimdiff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 734d15a03b..f8ad6b35d4 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -325,7 +325,7 @@ gen_cmd () { fi # If this is a single window diff with all the buffers - if ! echo "$tab" | grep ",\|/" >/dev/null + if ! echo "$tab" | grep -E ",|/" >/dev/null then CMD="$CMD | silent execute 'bufdo diffthis'" fi |