Mercurial > hg
view tests/test-nested-repo.out @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | c7e8fe11f34a |
children |
line wrap: on
line source
# should print nothing # should fail abort: path 'b/x' is inside repo 'b' abort: path 'b/x' is inside repo 'b' # should fail abort: path 'b/x' is inside repo 'b' # should arguably print nothing # should fail abort: path 'b/a' is inside repo 'b'