tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 15 Dec 2006 19:30:20 +0100
changeset 3900 2b3175acb653
parent 2175 b2ae81a7df29
permissions -rw-r--r--
Don't use node length for calculating revision number length. Done by moving repo.lookup of revisions from commands.export to patch.export
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)