comparison tests/test-filebranch.out @ 1043:9344f5dd4488

Update tests
author mpm@selenic.com
date Wed, 24 Aug 2005 19:19:35 -0700
parents 6f274afc05c7
children 6d50d6189269
comparison
equal deleted inserted replaced
1042:23f9d71ab9ae 1043:9344f5dd4488
10 pulling from ../a 10 pulling from ../a
11 searching for changes 11 searching for changes
12 adding changesets 12 adding changesets
13 adding manifests 13 adding manifests
14 adding file changes 14 adding file changes
15 added 1 changesets with 2 changes to 2 files 15 added 1 changesets with 2 changes to 2 files (+1 heads)
16 (run 'hg update' to get a working copy) 16 (run 'hg update' to get a working copy)
17 merging for foo 17 merging for foo
18 resolving manifests 18 resolving manifests
19 getting bar 19 getting bar
20 merging foo 20 merging foo