David Aguilar 1e86d5b11d mergetools: stop setting $status in merge_cmd() ...

No callers rely on $status so there's don't need to set
it during merge_cmd() for diffmerge, emerge, and kdiff3.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2014-11-21 11:27:53 -08:00

..

araxis

…

bc

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

bc3

mergetool: rename bc3 to bc

2014-10-21 11:25:30 -07:00

codecompare

…

deltawalker

…

diffmerge

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

diffuse

…

ecmerge

…

emerge

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

gvimdiff

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

gvimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

kdiff3

mergetools: stop setting $status in merge_cmd()

2014-11-21 11:27:53 -08:00

kompare

…

meld

mergetools/meld: make usage of --output configurable and more robust

2014-10-16 11:58:11 -07:00

opendiff

…

p4merge

mergetools/p4merge: create a base if none available

2013-03-13 10:46:07 -07:00

tkdiff

…

tortoisemerge

mergetools: teach tortoisemerge to handle filenames with SP correctly

2013-02-01 18:06:03 -08:00

vimdiff

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

vimdiff2

mergetools: simplify how we handle "vim" and "defaults"

2013-01-28 19:00:38 -08:00

vimdiff3

mergetools: add vimdiff3 mode

2014-04-22 12:49:07 -07:00

xxdiff

…