Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/lock.py @ 174:23057dc57d1b
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 | 0b4c5cb953d9 |
| children | 10c43444a38e 688d03d6997a |
comparison
equal
deleted
inserted
replaced
| 173:8da1df932c16 | 174:23057dc57d1b |
|---|