Mercurial > hg > gitserve
diff tests/test-unrelated-pull.out @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 853bfbf1a312 1f9ec150a476 |
children | 0902ffece4b4 |
line wrap: on
line diff
--- a/tests/test-unrelated-pull.out Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-unrelated-pull.out Sat Jul 30 08:35:29 2005 -0800 @@ -1,3 +1,10 @@ ++ hg init ++ hg add a ++ hg commit -m a -u a -d 0 0 ++ hg init ++ hg add b ++ hg commit -m b -u b -d 0 0 ++ hg pull ../a pulling from ../a searching for changes warning: pulling from an unrelated repository! @@ -6,6 +13,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) ++ hg heads changeset: 1:9a79c33a9db3 tag: tip user: a