Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-backwards-remove.out @ 2212:8164e3f31638
revert: require explicit revision when working dir has two parents.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 05 May 2006 10:31:03 -0700 |
parents | b2ae81a7df29 |
children |
rev | line source |
---|---|
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
1 a |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
383
4862a134e2c2
hg merge: fix time asymmetry bug with deleting files on update to past
mpm@selenic.com
parents:
diff
changeset
|
3 a |