![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Dan McGee <dpmcgee@gmail.com> | |
| Wed, 6 Jun 2007 01:19:47 +0000 (21:19 -0400) | ||
| committer | Theodore Ts'o <tytso@mit.edu> | |
| Sun, 10 Jun 2007 12:27:29 +0000 (08:27 -0400) | ||
| commit | 730b5b45fb8a7751106885d350466c197b671b1c | |
| tree | 044bfa742a590ca404b1d92233a6eed7c6a7f6c0 | tree | snapshot |
| parent | e58db03bbee4af96e60b6ac88b84c1c11b8b037e | commit | diff |
[PATCH] git-mergetool: Allow gvimdiff to be used as a mergetool
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Acked-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Acked-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 |