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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html