Mercurial > hg
comparison tests/test-merge9 @ 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 | 5a14a8f3b909 |
| children | 30cb79d84352 |
comparison
equal
deleted
inserted
replaced
| 7820:346fafc144fc | 7821:9fe7e6acf525 |
|---|