diff -r 3044a3fdae76 -r b2ae81a7df29 tests/test-hook.out
--- a/tests/test-hook.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-hook.out	Tue May 02 18:44:02 2006 +0200
@@ -3,16 +3,20 @@
 0:29b62aeb769f
 commit hook: n=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p1=0000000000000000000000000000000000000000 p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 pretxncommit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 1:b702efe96888
 commit hook: n=b702efe9688826e3a91283852b328b84dbf37bc2 p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 precommit hook: p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 pretxncommit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 2:1324a5531bac
 commit hook: n=1324a5531bac09b329c3845d35ae6a7526874edb p1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b p2=
 commit hook b
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
 precommit hook: p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
 pretxncommit hook: n=4c52fb2e402287dd5dc052090682536c8406c321 p1=1324a5531bac09b329c3845d35ae6a7526874edb p2=b702efe9688826e3a91283852b328b84dbf37bc2
 3:4c52fb2e4022