On Mon, Mar 25, 2013 at 1:17 PM, Junio C Hamano <gits...@pobox.com> wrote:
> Subject: [PATCH] merge-one-file: force content conflict for "both side added"
s/both side/both sides/
> Historically, we tried to be lenient to "both side added, slightly
> differently" case and as long as the files can be merged using a
> made-up common ancestor cleanly, since f7d24bbefb06 (merge with
> /dev/null as base, instead of punting O==empty case, 2005-11-07).
> This was later further refined to use a better made-up common file
> with fd66dbf5297a (merge-one-file: use empty- or common-base
> condintionally in two-stage merge., 2005-11-10), but the spirit has
> been the same.
> But the original fix in f7d24bbefb06 to avoid punging on "both sides
> added" case had a code to unconditionally error out the merge. When
> this triggers, even though the content-level merge can be done
> cleanly, we end up not saying "content conflict" in the message, but
> still issue the error message, showing "ERROR: in <pathname>".
> Signed-off-by: Junio C Hamano <gits...@pobox.com>
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html