From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Jun 2017 20:45:21 +0000 (-0700)
Subject: Merge branch 'pw/rebase-i-regression-fix-tests'
X-Git-Tag: v2.14.0-rc0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=545222471004cc3fd53c54ff53d40a8bbc3dabe6;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-i-regression-fix-tests'

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
---

545222471004cc3fd53c54ff53d40a8bbc3dabe6