Mercurial > hg

view contrib/win32/postinstall.txt @ 23475:67f1d68861fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 03 Dec 2014 10:56:07 -0800
parents 1de6e7e1bb9f
children 4b0fc75f9403
line wrap: on
line source

Welcome to Mercurial for Windows!
---------------------------------

For configuration and usage directions, please read the ReadMe.html
file that comes with this package.

Also check the release notes at:

 http://mercurial.selenic.com/wiki/WhatsNew