diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 17:39:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 17:39:47 (GMT) |
| commit | 4ce498baa3976cf96d3feb4215a486dd47ec2e7b (patch) | |
| tree | 6461c3669e41cebaf33f124d5964c06072803187 /contrib | |
| parent | 62329d336f5d427d8f08035798bf62cd7d8fd847 (diff) | |
| parent | ddfc44a898a58311392a5329687a1813d6b94779 (diff) | |
| download | git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.zip git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.gz git-4ce498baa3976cf96d3feb4215a486dd47ec2e7b.tar.bz2 | |
Merge branch 'en/zdiff3'
"Zealous diff3" style of merge conflict presentation has been added.
* en/zdiff3:
update documentation for new zdiff3 conflictStyle
xdiff: implement a zealous diff3, or "zdiff3"
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 63b3a6b..377d6c5 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1566,7 +1566,7 @@ _git_checkout () case "$cur" in --conflict=*) - __gitcomp "diff3 merge" "" "${cur##--conflict=}" + __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}" ;; --*) __gitcomp_builtin checkout @@ -2437,7 +2437,7 @@ _git_switch () case "$cur" in --conflict=*) - __gitcomp "diff3 merge" "" "${cur##--conflict=}" + __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}" ;; --*) __gitcomp_builtin switch @@ -2877,7 +2877,7 @@ _git_restore () case "$cur" in --conflict=*) - __gitcomp "diff3 merge" "" "${cur##--conflict=}" + __gitcomp "diff3 merge zdiff3" "" "${cur##--conflict=}" ;; --source=*) __git_complete_refs --cur="${cur##--source=}" |