Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 2528:049f930f18c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.
author Sascha Wilde <wilde@sha-bang.de>
date Tue, 27 Jun 2006 21:56:11 +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)