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

File last commit:

r9611:a3d73b3e default
r10543:dd352616 merge stable
Show More
test-merge8.out
10 lines | 345 B | text/plain | TextLexer
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