summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
AgeCommit message (Expand)Author
2007-03-14Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o