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)
commit1e86d5b...1dcf31adf11363caa1e96a94612b16f4
tree87b8ace...7e6972a15fc054987b4fbac3e420a918copy hash to clipboard (tree)
parent98a2602...0c9b464dbefce1a23e4c89ed7b6ccb4dcopy hash to clipboard (diff)
mergetools/diffmerge
mergetools/emerge
mergetools/kdiff3