aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-mergetool.txt
Commit message (Expand)AuthorAge
* Fix minor formatting issue in man page for git-mergetoolTheodore Ts'o2007-03-29
* mergetool: Add support for vimdiff.James Bowes2007-03-18
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13