Re: [PATCH 1/7] merge-ort: mark a few more conflict messages as omittable

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 1, 2021, 17:19 UTC
Message-ID: <xmqqk0k0qkmv.fsf@gitster.g>
In-Reply-To: <CABPp-BEZjMLGFxSsTfRnAffom9CKRU4if4PsdTh+85L6D=FseA@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 14 quoted lines

> Creating this file means you see something like this in the
> remerge-diff (note there are diffs for two files, with the synthetic
> file appearing just before the file it has messages about):
>
> diff --git a/dir/my.fil e.conflict_msg b/dir/my.fil e.conflict_msg
> deleted file mode 100644
> index 2bd215a32f06..000000000000
> --- a/dir/my.fil e.conflict_msg
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -== Conflict notices for my.file ==
> -CONFLICT (modify/delete): dir/my.file deleted in HASH1 (SHORT
> SUMMARY1) and modified in HASH2 (SHORT SUMMARY 2).  Version HASH2
> (SHORT SUMMARY2) of  dir/my.file left in tree.

I do not know if my reaction should be "Cute" or "Yuck" ;-)

Hopefully nobody uses .conflict_msg as a suffix for their files.