diff -r c704b03884ef -r e7ed5d07cc4c tests/test-issue522.out
--- a/tests/test-issue522.out	Mon Jan 14 16:28:32 2008 -0600
+++ b/tests/test-issue522.out	Fri Jan 11 23:30:56 2008 +0200
@@ -11,7 +11,7 @@
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
-n   0         -2 unset             foo
+n   0         -2 unset               foo
 M foo
 c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
    rev    offset  length   base linkrev nodeid       p1           p2