Mercurial > hg
annotate tests/test-merge4.out @ 8784:9154c79c67cc
Merge with crew-stable
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 11 Jun 2009 12:23:08 -0700 |
parents | 4b0c9c674707 |
children |
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 |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
2175
diff
changeset
|
2 created new head |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
925
diff
changeset
|
3 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
|
4 (branch merge, don't forget to commit) |