Mercurial > hg
view tests/test-simplemerge-cmd.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 | ea7b982b6c08 |
children | e1f4343db740 |