git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5879b6b)
mergetool-lib: combine vimdiff and gvimdiff run blocks
authorDan McGee <redacted>
Wed, 15 Sep 2010 02:21:42 +0000 (21:21 -0500)
committerJunio C Hamano <redacted>
Wed, 15 Sep 2010 17:14:15 +0000 (10:14 -0700)
commitae69fd0481fa7bb39ee9ee68dc2e009d500e3b1d
tree3669d03d893c745e1ac5792a040c1ff7d2f41961tree | snapshot
parent5879b6bbcaba7696e4abfa717748da166f915405commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
git-mergetool--lib.sh diff | blob | history
git clone https://git.99rst.org/PROJECT