--- a/tests/test-issue672.out Sun Feb 03 19:29:05 2008 -0600
+++ b/tests/test-issue672.out Sun Feb 03 19:29:05 2008 -0600
@@ -28,8 +28,10 @@
1a -> 1 *
checking for directory renames
1a: local moved to 1 -> m
+picked tool 'internal:merge' for 1a (binary False symlink False)
merging 1a and 1
my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
+ premerge successful
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -44,8 +46,10 @@
checking for directory renames
1: remote moved to 1a -> m
copying 1 to 1a
+picked tool 'internal:merge' for 1 (binary False symlink False)
merging 1 and 1a
my 1@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
+ premerge successful
removing 1
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)