Mercurial > hg
annotate tests/test-merge4.out @ 4392:9770d260a405
Make rm --after simply mark files as removed, unless --force is also given
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Apr 2007 08:51:59 -0700 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
3 (branch merge, don't forget to commit) |