Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge6.out @ 642:5d6177b72fcc
Update tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 06 Jul 2005 22:27:25 -0800 |
parents | d45d1c90032e |
children | 32f7dc81c07e |
line wrap: on
line diff
--- a/tests/test-merge6.out +++ b/tests/test-merge6.out @@ -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