[PATCH v2 1/5] Sort the list of tools that support both merging and diffing alphabetically
From: Sebastian Schuberth <hidden>
Date: 2016-06-15 22:54:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Sebastian Schuberth <redacted> --- contrib/completion/git-completion.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5be9dee..f2c4894 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash@@ -1325,8 +1325,8 @@ _git_diff () __git_complete_revlist_file } -__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff - tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 +__git_mergetools_common="araxis bc3 diffuse ecmerge emerge gvimdiff + kdiff3 meld opendiff p4merge tkdiff vimdiff xxdiff " _git_difftool ()
--
1.7.11.msysgit.2