summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)Author
2007-03-19mergetool: print an appropriate warning if merge.tool is unknownTheodore Ts'o
2007-03-19mergetool: Add support for vimdiff.James Bowes
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o