On 18/11/2010 10:40, Sebastian Schuberth wrote:
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(-)
I'm not an ecmerge or Beyond Compare user. The reordering of tools makes for a bit of a messy diff but I think it makes sense.
This series looks good to me. Has it been well tested? Charles. -- 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