diff -r 605deb776abf -r 101b80eb7364 tests/test-rename-dir-merge.t
--- a/tests/test-rename-dir-merge.t	Fri May 03 13:59:58 2013 -0700
+++ b/tests/test-rename-dir-merge.t	Fri May 03 14:19:30 2013 -0700
@@ -51,7 +51,7 @@
   getting b/b
   updating: b/b 4/5 files (80.00%)
   updating: a/c 5/5 files (100.00%)
-  moving a/c to b/c
+  moving a/c to b/c (glob)
   3 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (branch merge, don't forget to commit)