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

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

merge: don't ignore conflicting file in remote renamed directory...
merge: don't ignore conflicting file in remote renamed directory When the remote side has renamed a directory from a/ to b/ and added a file b/c in it, and the local side has added a file a/c, we end up moving a/c to b/c without considering the remote version of b/c. Add a check for this case and use the merge ('m') action in this case instead of the directory rename ('dm') action.
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default
r23475:67f1d688 default
Show More
header.tmpl
1 line | 86 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / atom / header.tmpl
History | Annotation | Raw |Copy content |Copy permalink
<?xml version="1.0" encoding="{encoding}"?>
<feed xmlns="http://www.w3.org/2005/Atom">