--- a/tests/test-merge5.out Fri Jul 22 19:45:48 2005 -0800
+++ b/tests/test-merge5.out Fri Jul 22 19:46:02 2005 -0800
@@ -10,6 +10,7 @@
+ hg update 0
+ rm b
+ hg commit -A '-mcomment #2' -d '0 0'
+removing b
+ yes k
+ hg update 1
this update spans a branch affecting the following files: