From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 28 Feb 2010 20:15:42 GMT
Subject: Re: [PATCH 2/3] make union merge an xdl merge favor
Message-ID: <7vwrxx2k29.fsf@alter.siamese.dyndns.org>
In-Reply-To: <17999fdb3ff374156acb7fc670426265fa27b94b.1267385538.git.bert.wesarg@googlemail.com>

Bert Wesarg <bert.wesarg@googlemail.com> writes:

> The current union merge driver is implemented as an post process.  But the
> xdl_merge code is quite capable to produce the result by itself.  Therefore
> move to it there and teach git-merge-file a new --union option.

I like the idea of patch 2 and 3 but they are independent of what we do
(or don't do) to merge-file.  Could you flip the order of the patches so
that 2 and 3 can go first?