changeset 676 | 32f7dc81c07e |
parent 642 | 5d6177b72fcc |
child 749 | 7e4843b7efd2 |
--- a/tests/test-merge6.out Sun Jul 10 16:15:20 2005 -0800 +++ b/tests/test-merge6.out Sun Jul 10 16:17:05 2005 -0800 @@ -11,7 +11,6 @@ + hg commit -t 'commit text' -d '0 0' -u user + cd .. + hg clone A1 B1 -cloning by hardlink + cd A1 + rm bar + hg remove bar @@ -21,9 +20,7 @@ + hg commit -t 'commit test' -d '0 0' -u user + cd .. + hg clone A1 A2 -cloning by hardlink + hg clone B1 B2 -cloning by hardlink + cd A1 + hg pull ../B1 pulling from ../B1