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
gvimdiff2
gvimdiff3
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
tkdiff
tortoisemerge
vimdiff
vimdiff2
vimdiff3
xxdiff