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

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

merge: don't overwrite conflicting file in locally renamed directory...
merge: don't overwrite conflicting file in locally renamed directory When the local side has renamed a directory from a/ to b/ and added a file b/c in it, and the remote side has added a file a/c, we end up overwriting the local file b/c with the contents of remote file a/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename get ('dg') action.
Martin von Zweigbergk -
r23476:39a12719 default
Show More
Name Size Modified Last Commit Author
/ mercurial / templates / static
background.png Loading ...
coal-file.png Loading ...
coal-folder.png Loading ...
excanvas.js Loading ...
feed-icon-14x14.png Loading ...
hgicon.png Loading ...
hglogo.png Loading ...
mercurial.js Loading ...
style-coal.css Loading ...
style-gitweb.css Loading ...
style-monoblue.css Loading ...
style-paper.css Loading ...
style.css Loading ...