From: Sebastian Schuberth Date: Mon, 23 Jul 2012 07:17:10 GMT Subject: [PATCH v2 1/5] Sort the list of tools that support both merging and diffing alphabetically Message-ID: <500CFA76.3060600@gmail.com> In-Reply-To: <500CF9D2.30102@gmail.com> Signed-off-by: Sebastian Schuberth --- 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