tests/test-backwards-remove.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 09:43:50 -0700
changeset 2264 fdb699b5e132
parent 2175 b2ae81a7df29
permissions -rw-r--r--
localrepo.update: abort if outstanding merges, instead of warn/return 1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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