changeset 642 | 5d6177b72fcc |
parent 616 | d45d1c90032e |
child 676 | 32f7dc81c07e |
--- a/tests/test-merge6.out Wed Jul 06 22:27:07 2005 -0800 +++ b/tests/test-merge6.out Wed Jul 06 22:27:25 2005 -0800 @@ -11,6 +11,7 @@ + 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 @@ -20,7 +21,9 @@ + 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