diff -r 2f09df302f30 -r bbdcacf7cef8 tests/test-mq.out --- a/tests/test-mq.out Mon Jul 16 14:43:47 2007 -0700 +++ b/tests/test-mq.out Mon Jul 16 16:50:47 2007 -0700 @@ -325,6 +325,8 @@ 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