Mercurial > hg > mercurial-crew-with-dirclash
comparison contrib/win32/ReadMe.html @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Mon, 03 Jul 2006 19:14:29 +0200 |
parents | 280fde4b8701 |
children | 259acfb963d1 |
comparison
equal
deleted
inserted
replaced
2547:d75c68b55af8 | 2548:0229ff95faec |
---|