Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

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>
latest commit 1e86d5b11d
@davvid davvid authored gitster committed
..
Failed to load latest commit information.
araxis mergetool--lib: Refactor tools into separate files
bc mergetool: rename bc3 to bc
bc3 mergetool: rename bc3 to bc
codecompare Add Code Compare v2.80.4 as a merge / diff tool for Windows
deltawalker mergetools: add a plug-in to support DeltaWalker
diffmerge mergetools: stop setting $status in merge_cmd()
diffuse mergetool--lib: Refactor tools into separate files
ecmerge mergetool--lib: Refactor tools into separate files
emerge mergetools: stop setting $status in merge_cmd()
gvimdiff
gvimdiff2
gvimdiff3
kdiff3 mergetools: stop setting $status in merge_cmd()
kompare mergetool--lib: Refactor tools into separate files
meld mergetools/meld: make usage of `--output` configurable and more robust
opendiff mergetool--lib: Refactor tools into separate files
p4merge mergetools/p4merge: create a base if none available
tkdiff mergetool--lib: Refactor tools into separate files
tortoisemerge mergetools: teach tortoisemerge to handle filenames with SP correctly
vimdiff mergetools: add vimdiff3 mode
vimdiff2
vimdiff3
xxdiff mergetool--lib: Refactor tools into separate files
Something went wrong with that request. Please try again.