tests: make merge conflicts explicit in `hg annotate` tests
ClosedPublic

Authored by martinvonz on Apr 16 2019, 1:16 PM.

Details

Summary

We were using true as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
martinvonz created this revision.Apr 16 2019, 1:16 PM
marmoute accepted this revision.Apr 17 2019, 4:36 PM
marmoute added a subscriber: marmoute.

This one seems simple and sensible.

pulkit accepted this revision.Apr 17 2019, 5:18 PM
This revision was automatically updated to reflect the committed changes.