Mercurial > hg
view tests/test-patch.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 | 0750f11152fe |
children | 7b19cda0fa10 |
line wrap: on
line source
adding a % check custom patch options are honored requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files updating working directory 1 files updated, 0 files merged, 0 files removed, 0 files unresolved applying ../a.diff Using custom patch nothing changed