diff options
author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2016-07-26 18:05:43 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-26 11:13:44 -0700 |
commit | 3be18b47e4249a3e3f8ae9968abffc954c7e293a (patch) | |
tree | 39e44bd60b67333a66ed670ced5d90ed3d234e1f /diffcore-pickaxe.c | |
parent | Seventh batch of topics for 2.10 (diff) | |
download | tgif-3be18b47e4249a3e3f8ae9968abffc954c7e293a.tar.xz |
t5520: verify that `pull --rebase` shows the helpful advice when failing
It was noticed by Brendan Forster last October that the builtin `git am`
regressed on that. Our hot fix reverted to spawning the recursive merge
instead of using it as a library function.
As we are about to revert that hot fix, after making the recursive merge a
true library function (i.e. a function that does not die() in case of
"normal" errors), let's add a test that verifies that we do not regress on
the same problem which made the hot fix necessary in the first place.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions