From: Dan McGee <dpmcgee@gmail.com>
Date: Wed, 15 Sep 2010 02:21:42 +0000 (-0500)
Subject: mergetool-lib: combine vimdiff and gvimdiff run blocks
X-Git-Tag: v1.7.4-rc0~166^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ae69fd0481fa7bb39ee9ee68dc2e009d500e3b1d?hp=ae69fd0481fa7bb39ee9ee68dc2e009d500e3b1d

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>
---