summaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAgeFilesLines
* mergetool: Add support for vimdiff.James Bowes2007-03-181-1/+1
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-131-0/+46