diff -r a1aad25ccc3e -r 49966b5ab16f tests/test-extdiff.out
--- a/tests/test-extdiff.out	Tue Oct 10 00:02:30 2006 +0200
+++ b/tests/test-extdiff.out	Wed Oct 11 16:35:09 2006 +0200
@@ -29,4 +29,11 @@
 making snapshot of 1 files from rev e27a2475d60a
 making snapshot of 1 files from rev 5e49ec8d3f05
 diffing a.e27a2475d60a a.5e49ec8d3f05
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 1 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+making snapshot of 1 files from rev 5e49ec8d3f05
+making snapshot of 1 files from working dir
+diffing a.5e49ec8d3f05 a
 diff-like tools yield a non-zero exit code