tests/test-rename-merge2.out
changeset 3295 764688cf51e5
parent 3288 438b0638dbf5
child 3305 e7abcf3a7c5f
--- a/tests/test-rename-merge2.out
+++ b/tests/test-rename-merge2.out
@@ -42,6 +42,7 @@ 1 files updated, 2 files merged, 0 files
 --------------
 M a
 M b
+  a
 --------------
 
 --------------
@@ -85,6 +86,7 @@ 0 files updated, 2 files merged, 0 files
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -128,6 +130,7 @@ 0 files updated, 2 files merged, 0 files
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 C a
 --------------
 
@@ -172,6 +175,7 @@ 0 files updated, 2 files merged, 0 files
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -430,6 +434,7 @@ 0 files updated, 2 files merged, 0 files
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 --------------
 
 --------------
@@ -452,6 +457,7 @@ 1 files updated, 2 files merged, 0 files
 (branch merge, don't forget to commit)
 --------------
 M b
+  a
 M c
 --------------