sequencer: signal failed ff as an aborted, not a conflicted merge
authorFabian Ruch <bafain@gmail.com>
Mon, 9 Jun 2014 15:04:36 +0000 (17:04 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2014 21:55:43 +0000 (14:55 -0700)
commit43dee07...eb8faa400f24a9fee08e64d2d18224c2
tree5e038c7...bbfe50637a3add5420d61377c9055db3copy hash to clipboard (tree)
parentbce14aa...32e0064d9a9b1c7ad98e71e22c6e0272copy hash to clipboard (diff)
sequencer.c