Patches 2/3 and 3/3 are already in 'da/difftool' in 'pu'. This series is based on 'master', now they can be applied to 4msysgit.git. 'da/difftool' should be recreated anyway. Markus Heidelberg (3): doc/merge-config: list ecmerge as a valid merge tool git-mergetool/difftool: make (g)vimdiff workable under Windows git-mergetool: add new merge tool TortoiseMerge Documentation/git-mergetool.txt | 3 ++- Documentation/merge-config.txt | 3 ++- contrib/difftool/git-difftool-helper | 10 ++++++++-- git-mergetool.sh | 26 +++++++++++++++++++++----- 4 files changed, 33 insertions(+), 9 deletions(-) -- 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
