From: Alex Riesen <raa.lkml@gmail.com>
Date: Thu, 29 Jun 2006 07:43:02 GMT
Subject: Re: Improved three-way blob merging code
Message-ID: <81b0412b0606290043s15e19b9fl853627e815f009ff@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0606282157210.12404@g5.osdl.org>

On 6/29/06, Linus Torvalds <torvalds@osdl.org> wrote:
> +static void *three_way_filemerge(mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size)
> +{
...
> +       if (t1 && t2 && t3) {
> +               int code = run_command("merge", t2, t1, t3, NULL);

This does not use the labels of merge(1) and the merged file will contain
the names of temporary files at conflict places, which is very confusing if
you happen to loose context while doing a merge with lots of conflicts.