Mercurial > hg
comparison tests/test-simplemerge-cmd @ 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 | c6413f8f2f8e |
| children | e1f4343db740 |
comparison
equal
deleted
inserted
replaced
| 7820:346fafc144fc | 7821:9fe7e6acf525 |
|---|