##// END OF EJS Templates
Added tests for bug with three-way-merging of old tip, tip and cwd.
Added tests for bug with three-way-merging of old tip, tip and cwd.

File last commit:

r784:853bfbf1 default
r792:49ec802b default
Show More
test-unrelated-pull.out
19 lines | 508 B | text/plain | TextLexer
/ tests / test-unrelated-pull.out
pulling from ../a
searching for changes
warning: pulling from an unrelated repository!
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
changeset: 1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
tag: tip
user: a
date: Thu Jan 1 00:00:00 1970
summary: a
changeset: 0:01f8062b2de51c0fa6428c5db1d1b3ea780189df
user: b
date: Thu Jan 1 00:00:00 1970
summary: b