Re: [Monotone-devel] conflict messages

[Derek Scherger]

I've merged the conflict messages branch to mainline and make check
seems happy with things. The associated lua test runs all of the various
merge commands through all of the various individual conflict cases and
a few combined conflict cases as well. It has the dubious honor of being
the longest test in the suite.

I'm sure there's still room for improvement in these messages so please
let me know if you have better ideas. I do still plan on adding a
section describing the various conflicts to the manual but it may be a
few days before I get to that.

Cheers,
Derek