| commit | ae69fd0481fa7bb39ee9ee68dc2e009d500e3b1d | |
| author | Dan McGee <dpmcgee@gmail.com> | |
| Wed, 15 Sep 2010 02:21:42 +0000 (14 21:21 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 15 Sep 2010 17:14:15 +0000 (15 10:14 -0700) | ||
| tree | 3669d03d893c745e1ac5792a040c1ff7d2f41961 | treesnapshot (tar.gz zip) |
| parent | 5879b6bbcaba7696e4abfa717748da166f915405 | commitdiff |
mergetool-lib: combine vimdiff and gvimdiff run blocks
They are nearly identical outside of the foreground flag, which can safely
be passed to both vim and gvim. The merge tool itself is named in
$merge_tool_path.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
They are nearly identical outside of the foreground flag, which can safely
be passed to both vim and gvim. The merge tool itself is named in
$merge_tool_path.
Signed-off-by: Dan McGee <dpmcgee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-mergetool--lib.sh | diffblobblamehistory |