aboutsummaryrefslogtreecommitdiff
path: root/git-mergetool.sh
Commit message (Expand)AuthorAge
* Add git-mergetool to run an appropriate merge conflict resolution programTheodore Ts'o2007-03-13