Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 3070:24c1db20990c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include section name and parameter name (if available) in config errors. Added tests for this.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 08 Sep 2006 10:01:45 +0200
parents b2ae81a7df29
children
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)