##// END OF EJS Templates
tests: make merge conflicts explicit in `hg annotate` tests...
tests: make merge conflicts explicit in `hg annotate` tests 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". Differential Revision: https://phab.mercurial-scm.org/D6252

File last commit:

r9999:f91e5630 default
r42327:7116fc61 default
Show More
background.png
0 lines | 603 B | image/png | TextLexer
/ mercurial / templates / static / background.png
rendered-image