Mercurial > hg

annotate tests/test-merge4.out @ 10198:c2168d170f05

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepo-svn: normalize OS specific path separator
author Patrick Mezard <pmezard@gmail.com>
date Sat, 02 Jan 2010 16:03:29 +0100
parents 4b0c9c674707
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
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 2175
diff changeset
2 created new head
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 925
diff changeset
3 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
4 (branch merge, don't forget to commit)