| commit | 29734cc296410f361e5abce79306986eeb4e5341 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 19:51:45 +0000 (16 12:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Jun 2014 19:51:45 +0000 (16 12:51 -0700) | ||
| tree | 59244ccc2389bab5c9aed81e15611a3d6847709a | treesnapshot (tar.gz zip) |
| parent | 5428530a0b651ff8f5b20fb6e7c7536da3613d3e | commitdiff |
| parent | 43dee070eb8faa400f24a9fee08e64d2d18224c2 | commitdiff |
Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff' into next
* fr/sequencer-fail-with-not-one-upon-no-ff:
sequencer: signal failed ff as an aborted, not a conflicted merge
* fr/sequencer-fail-with-not-one-upon-no-ff:
sequencer: signal failed ff as an aborted, not a conflicted merge
| sequencer.c | diff1 | diff2 | blobhistory |