mergetool: Add support for vimdiff.
commit9cec65399d3575774910b21c1cfd762a5e88a245
authorJames Bowes <jbowes@dangerouslyinc.com>
Mon, 19 Mar 2007 02:11:54 +0000 (18 22:11 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 19 Mar 2007 02:13:48 +0000 (18 22:13 -0400)
treeea9a9901df003f61123a0dc68980d9200e0f7ecb
parent7976ce1b909f8d61aa40108f8443e9fe585d15ac
mergetool: Add support for vimdiff.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Documentation/config.txt
Documentation/git-mergetool.txt
git-mergetool.sh