2 Commits (0d315468f38729ebb15711349cece98a467032c9)

Author SHA1 Message Date
James Bowes 9cec65399d mergetool: Add support for vimdiff. 18 years ago
Theodore Ts'o c4b4a5af16 Add git-mergetool to run an appropriate merge conflict resolution program 18 years ago