[PATCH 0/3] Improvements to mergetool-lib
- From
Sebastian Schuberth <sschuberth@gmail.com>
- Date
- Nov 18, 2010, 10:40 UTC
- Message-ID
- <4CE50290.90600@gmail.com>
This small series adds Beyond Compare 3 as a diff / merge tool and performs some minor improvements.
Sebastian Schuberth (3): mergetool--lib: Sort tools alphabetically for easier lookup mergetool--lib: Add Beyond Compare 3 as a tool mergetool--lib: Add the proper executable name for ECMerge
Documentation/git-difftool.txt | 4 +- Documentation/git-mergetool.txt | 4 +- Documentation/merge-config.txt | 8 +- contrib/completion/git-completion.bash | 2 +- git-gui/lib/mergetool.tcl | 101 +++++++------ git-mergetool--lib.sh | 243 +++++++++++++++++--------------- 6 files changed, 195 insertions(+), 167 deletions(-)
-- 1.7.3.2.msysgit.11