| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
| Wed, 11 Oct 2006 16:41:52 +0200 | |
| changeset 3331 | f472cf9a71af |
| parent 2830 | 49988d9f0758 |
| child 3580 | 41989e55fa37 |
| permissions | -rw-r--r-- |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2038
diff
changeset
|
1 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
2 |
removing b |
|
2830
49988d9f0758
Merge with crew, fix most tests
Matt Mackall <mpm@selenic.com>
parents:
2175
diff
changeset
|
3 |
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes |