tests/test-merge4.out
author Brendan Cully <brendan@kublai.com>
Wed, 27 Sep 2006 12:08:30 -0700
changeset 3177 8683c7a637ad
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: fix changeset link in annotate view.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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)