changeset 616 | d45d1c90032e |
parent 415 | c2b9502a4e96 |
child 749 | 7e4843b7efd2 |
--- a/tests/test-merge5.out Mon Jul 04 12:22:21 2005 -0800 +++ b/tests/test-merge5.out Mon Jul 04 12:38:34 2005 -0800 @@ -13,6 +13,7 @@ + yes k + hg update 1 this update spans a branch affecting the following files: + b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0