Re: [PATCH 2/7] merge-ort: add ability to record conflict messages in a file

On Thu, Sep 30, 2021 at 07:07:21PM -0700, Elijah Newren wrote:

quoted

That said, I think it could also make sense to annotate the conflict
files by giving them an unusual set of mode bits. That would be easier
to recognize (and while real trees _could_ have silly modes, we do
complain about them in fsck, so it shouldn't happen in practice).

I tried giving things unusual mode bits in early versions of merge-ort
for other reasons.  It doesn't work: canon_mode() will "fix" the
unusualness so there's no way for the reader to know that they had
unusual bits.

Ah, right, I totally forgot about that.

But, as you said later, avoiding these pseudo-files is going to be
cleaner anyway, so let's just do that.

I'm quite happy if you're on board with that direction. :)

-Peff