--- a/tests/test-issue1802.t	Tue Jan 15 01:05:12 2013 +0100
+++ b/tests/test-issue1802.t	Thu Jan 10 00:44:23 2013 +0100
@@ -59,7 +59,7 @@
    ancestor: a03b0deabf2b, local: d6fa54f68ae1+, remote: 2d8bcf2dda39
    a: update permissions -> e
   updating: a 1/1 files (100.00%)
-  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
 Simulate a Windows commit: