Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
* fr/sequencer-fail-with-not-one-upon-no-ff: sequencer: signal failed ff as an aborted, not a conflicted merge
Junio C Hamano committed
Jun 25, 2014 at 12:21 UTC
9ce7100b1c1aa3a1523057c904f081abcf87ed60
No changes.