Mercurial > hg > mercurial-crew-with-dirclash

comparison comparison.txt @ 174:23057dc57d1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg merge: abort if there are outstanding changes in the working directory We currently don't support merging from the tip into the working directory, so merge with outstanding local changes is asking for trouble.
author mpm@selenic.com
date Thu, 26 May 2005 22:54:48 -0800
parents 17e66e1a0382
children 2073e5a71008
comparison
equal deleted inserted replaced
173:8da1df932c16 174:23057dc57d1b