Re: Determining if a merge was produced automatically

> 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.
>