From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Nov 2010 20:55:27 GMT
Subject: Re: [PATCH v2] rebase -X: do not clobber strategy
Message-ID: <7vaalefeio.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTinrhfmeeToMZfW942xvJGz9vgiQd6+2bXkSawJU@mail.gmail.com>

Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:

> That's clever. Thank you!
>
> The fix for this bug touches the same parts of the code as my
> refactoring of git rebase. If you don't mind, I will post your test
> case and the fix as part of the refactoring series.

Nah, I'd rather squash the test script into the fix.