Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 3879:9c8488490724

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set charset encoding for hgwebdir, too. (And remove extra spaces in the corresponding place in hgweb)
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 14 Dec 2006 16:07:29 +0100
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)