On Mon, Jul 1, 2024 at 4:11 PM Elijah Newren <newren@xxxxxxxxx> wrote: > However, this wording was not intended to detract from the main point > that "empty output means clean merge and non-empty output means > conflicted merge" (it never even occurred to me that someone might > read that part of the documentation and assume that it presents a > problem for checking-if-diff-is-empty). I use it for the same > purpose, and that's absolutely a guarantee we want to provide. If you > want to guarantee output format beyond that, though, then I object. > That's good to know; thanks! Back to Jonathan's suggestion: I don't know how to express that in documentation. I cannot suggest any good wording at this time.
