From: Sebastian Schuberth Date: Mon, 23 Jul 2012 07:10:06 GMT Subject: [PATCH 0/4] Various merge / diff tool related minor clean-ups and improvements Message-ID: <500CF8CE.90906@gmail.com> This series introduce various minor clean-ups and improvements to the merge / diff tool scripts and documentation. Sebastian Schuberth (4): 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 | 11 +++++++++-- git-mergetool--lib.sh | 6 ++++++ mergetools/araxis | 8 +++++++- 4 files changed, 28 insertions(+), 6 deletions(-) -- 1.7.11.msysgit.2