Mercurial > hg

annotate tests/test-merge4.out @ 3383:c7c6f1a45348

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test case for log --copies on non-linear manifests (issue391)
author Brendan Cully <brendan@kublai.com>
date Fri, 13 Oct 2006 09:58:55 -0700
parents b2ae81a7df29
children 4b0c9c674707
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)