Merge branch 'en/sequencer-empty-edit-result-aborts' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:45 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:45 +0000 (22:57 +0900)
"git rebase" etc. in Git 2.19 fails to abort when given an empty
commit log message as result of editing, which has been corrected.

* en/sequencer-empty-edit-result-aborts:
sequencer: fix --allow-empty-message behavior, make it smarter

1  2 
sequencer.c
t/t3404-rebase-interactive.sh
diff --cc sequencer.c
Simple merge
Simple merge