3 Commits (5c49c11686df9d1c27a194349d0b2092e6446f42)

Author SHA1 Message Date
Theodore Ts'o e15b484f6a Fix minor formatting issue in man page for git-mergetool 18 years ago
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