##// END OF EJS Templates
merge with crew
merge with crew

File last commit:

r6338:0750f111 default
r7248:723d7a2e merge default
Show More
test-simple-update.out
25 lines | 775 B | text/plain | TextLexer
/ tests / test-simple-update.out
adding foo
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../branch
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
(run 'hg update' to get a working copy)
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
foo
bar
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo