summaryrefslogtreecommitdiff
path: root/diffcore-pickaxe.c
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2014-11-21 01:03:10 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-11-21 11:27:53 -0800
commit1e86d5b11dcf31adf11363caa1e96a94612b16f4 (patch)
tree87b8ace37e6972a15fc054987b4fbac3e420a918 /diffcore-pickaxe.c
parentmergetool: simplify conditionals (diff)
downloadtgif-1e86d5b11dcf31adf11363caa1e96a94612b16f4.tar.xz
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>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions