From: Johannes Schindelin Date: Tue, 26 Jul 2016 16:05:43 +0000 (+0200) Subject: t5520: verify that `pull --rebase` shows the helpful advice when failing X-Git-Tag: v2.10.0-rc0~21^2~15 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3be18b47e4249a3e3f8ae9968abffc954c7e293a?hp=3be18b47e4249a3e3f8ae9968abffc954c7e293a 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 Signed-off-by: Junio C Hamano ---