##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
Martin von Zweigbergk -
r42327:7116fc61 default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / static
background.png Loading ...
coal-file.png Loading ...
coal-folder.png Loading ...
feed-icon-14x14.png Loading ...
followlines.js Loading ...
hgicon.png Loading ...
hglogo.png Loading ...
mercurial.js Loading ...
style-extra-coal.css Loading ...
style-gitweb.css Loading ...
style-monoblue.css Loading ...
style-paper.css Loading ...
style.css Loading ...