Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge4.out @ 3250:e96d2956eb4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
util.strdate: compute timestamp using UTC, not local timezone
author Jose M. Prieto <jmprieto@gmx.net>
date Tue, 03 Oct 2006 12:33:14 +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)