"GOT", but the "O" is a cute, smiling pufferfish. Index | Thread | Search

From:
Stefan Sperling <stsp@stsp.name>
Subject:
Re: got patch; got patch -R
To:
Omar Polo <op@omarpolo.com>
Cc:
Christian Weisgerber <naddy@mips.inka.de>, gameoftrees@openbsd.org
Date:
Thu, 21 Jul 2022 06:54:22 +0200

Download raw body.

Thread 
On Wed, Jul 20, 2022 at 11:51:56PM +0200, Omar Polo wrote:
> A quick solution may be to disable the diff3 merge in -R mode:

> However, I think we can do better.

Yes, swapping the diff3 tmpfile/oldfile file arguments (and labels)
in patch.c will do a reverse-merge for -R mode.

The old blob will still be used as the merge base.