![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | James Bowes <jbowes@dangerouslyinc.com> | |
| Mon, 19 Mar 2007 02:11:54 +0000 (22:11 -0400) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Mon, 19 Mar 2007 02:13:48 +0000 (22:13 -0400) | ||
| commit | 9cec65399d3575774910b21c1cfd762a5e88a245 | |
| tree | ea9a9901df003f61123a0dc68980d9200e0f7ecb | tree | snapshot |
| parent | 7976ce1b909f8d61aa40108f8443e9fe585d15ac | commit | diff |
mergetool: Add support for vimdiff.
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| Documentation/config.txt | diff | blob | history | |
| Documentation/git-mergetool.txt | diff | blob | history | |
| git-mergetool.sh | diff | blob | history |