Merge branch 'pw/rebase-i-regression-fix-tests'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Jun 2017 20:45:21 +0000 (13:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Jun 2017 20:45:21 +0000 (13:45 -0700)
Fix a recent regression to "git rebase -i" and add tests that would
have caught it and others.

* pw/rebase-i-regression-fix-tests:
t3420: fix under GETTEXT_POISON build
rebase: add more regression tests for console output
rebase: add regression tests for console output
rebase -i: add test for reflog message
sequencer: print autostash messages to stderr

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