Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/fish-merge @ 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 | 9f64ee817199 |
children | 3d4d5f2aba9a 4fc63e22b1fe |
comparison
equal
deleted
inserted
replaced
173:8da1df932c16 | 174:23057dc57d1b |
---|