From: Sebastian Schuberth Date: Mon, 23 Jul 2012 07:14:26 GMT Subject: [PATCH v2 0/5] Various merge / diff tool related minor clean-ups and improvements Message-ID: <500CF9D2.30102@gmail.com> In-Reply-To: <500CF8CE.90906@gmail.com> This series introduces various minor clean-ups and improvements to the merge / diff tool scripts and documentation. Sorry, the first version was missing a patch. Sebastian Schuberth (5): Sort the list of tools that support both merging and diffing alphabetically Use variables for the lists of tools that support merging / diffing Explicitly list all valid diff tools and document --tool-help as an option Make sure to use Araxis' "compare" and not e.g. ImageMagick's Add a few more code comments and blank lines in guess_merge_tool Documentation/git-difftool.txt | 9 ++++++--- contrib/completion/git-completion.bash | 15 +++++++++++---- git-mergetool--lib.sh | 6 ++++++ mergetools/araxis | 8 +++++++- 4 files changed, 30 insertions(+), 8 deletions(-) -- 1.7.11.msysgit.2