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 /git-gui/lib | |
| parent | 786a89d3477c339676ed36d5d2d7507251344952 (diff) | |
| parent | 43dee070eb8faa400f24a9fee08e64d2d18224c2 (diff) | |
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 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions