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