Add git-mergetool to run an appropriate merge conflict resolution program
authorTheodore Ts'o <tytso@mit.edu>
Tue, 6 Mar 2007 05:05:16 +0000 (00:05 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 14 Mar 2007 00:14:05 +0000 (20:14 -0400)
commitc4b4a5a...1604a7546c0b0786e47bcff8a47a6039
tree31a585e...3f75de124e44ab415316a16857e8b6b7copy hash to clipboard (tree)
parent27ebd6e...443bdd795869f598ecebc9eadd64a26ccopy hash to clipboard (diff)
.gitignore
Documentation/config.txt
Documentation/git-mergetool.txt [new file with mode: 0644]
Makefile
git-mergetool.sh [new file with mode: 0755]