Mercurial > hg
view tests/test-dirstatedirs.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 | 6dab29f6df37 |
children |
line wrap: on
line source
adding a/b/c/d/x adding a/b/c/d/y adding a/b/c/d/z moving a/b/c/d/x to z/b/c/d/x moving a/b/c/d/y to z/b/c/d/y moving a/b/c/d/z to z/b/c/d/z