| commit | 1e86d5b11dcf31adf11363caa1e96a94612b16f4 | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 21 Nov 2014 09:03:10 +0000 (21 01:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Nov 2014 19:27:53 +0000 (21 11:27 -0800) | ||
| tree | 87b8ace37e6972a15fc054987b4fbac3e420a918 | treesnapshot (tar.gz zip) |
| parent | 98a260220c9b464dbefce1a23e4c89ed7b6ccb4d | commitdiff |
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>
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 | diffblobblamehistory | |
| mergetools/emerge | diffblobblamehistory | |
| mergetools/kdiff3 | diffblobblamehistory |