]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 98a2602) | patch
mergetools: stop setting $status in merge_cmd()
authorDavid Aguilar <davvid@gmail.com>
Fri, 21 Nov 2014 09:03:10 +0000 (01:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Nov 2014 19:27:53 +0000 (11:27 -0800)
commit1e86d5b11dcf31adf11363caa1e96a94612b16f4
tree87b8ace37e6972a15fc054987b4fbac3e420a918tree | snapshot
parent98a260220c9b464dbefce1a23e4c89ed7b6ccb4dcommit | diff
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>
mergetools/diffmerge diff | blob | blame | history
mergetools/emerge diff | blob | blame | history
mergetools/kdiff3 diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.