tests/test-merge4.out
author TK Soh <teekaysoh@yahoo.com>
Wed, 03 May 2006 11:25:25 +0200
changeset 2186 1092533fd11c
parent 2175 b2ae81a7df29
permissions -rw-r--r--
tests: fix compatibility on Solaris
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)