| commit | 9ce7100b1c1aa3a1523057c904f081abcf87ed60 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 19:21:45 +0000 (25 12:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Jun 2014 19:21:45 +0000 (25 12:21 -0700) | ||
| tree | 6b8c27d54489e5bed75ed415ba6f32b7a05cfe86 | treesnapshot (tar.gz zip) |
| parent | 786a89d3477c339676ed36d5d2d7507251344952 | commitdiff |
| parent | 43dee070eb8faa400f24a9fee08e64d2d18224c2 | commitdiff |
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
* 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 |