changeset 4911 | fc502517d68d |
parent 4432 | 905397be7688 |
child 4915 | 8535c1770dd3 |
child 5124 | 06154aff2b1a |
--- a/tests/test-mq.out +++ b/tests/test-mq.out @@ -325,6 +325,8 @@ diff --git a/foo b/baz rename from foo rename to baz 2 baz (foo) +diff --git a/bar b/bar +diff --git a/foo b/baz 1 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved