sapling/tests/test-merge8.out

updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
(run 'hg update' to get a working copy)
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
hg.clone: report branch name on update 2009-10-17 01:57:34 +04:00			`updating to branch default`
Test for 1de7d8df2123 (update dirstate correctly for non-branchmerge updates) (Test case created by Johannes Hofmann) 2006-10-14 12:53:29 +04:00			`1 files updated, 0 files merged, 0 files removed, 0 files unresolved`
			`pulling from ../a`
			`searching for changes`
			`adding changesets`
			`adding manifests`
			`adding file changes`
			`added 2 changesets with 2 changes to 1 files`
			`(run 'hg update' to get a working copy)`
merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests. 2007-05-08 11:59:13 +04:00			`1 files updated, 0 files merged, 1 files removed, 0 files unresolved`