Hi Junio,
On Mon, 25 Jul 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > +test_expect_success '--rebase with conflicts shows advice' '
> > + test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
> > + git checkout -b seq &&
> > + printf "1\\n2\\n3\\n4\\n5\\
Johannes Schindelin writes:
> +test_expect_success '--rebase with conflicts shows advice' '
> + test_when_finished "git rebase --abort; git checkout -f to-rebase" &&
> + git checkout -b seq &&
> + printf "1\\n2\\n3\\n4\\n5\\n" >seq.txt &&
Make this more readble by using test-write-li
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 funct
3 matches
Mail list logo
