diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-25 12:21:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 12:21:45 -0700 |
| commit | 9ce7100b1c1aa3a1523057c904f081abcf87ed60 (patch) | |
| tree | 6b8c27d54489e5bed75ed415ba6f32b7a05cfe86 /resolve-undo.c | |
| parent | Fourth batch for 2.1 (diff) | |
| parent | sequencer: signal failed ff as an aborted, not a conflicted merge (diff) | |
| download | tgif-9ce7100b1c1aa3a1523057c904f081abcf87ed60.tar.xz | |
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
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions