Mercurial > hg

comparison tests/test-double-merge.out @ 8387:50b6af595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add -S/--show option to review revisions without merging
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 14 May 2009 16:03:17 +0200
parents 368a4ec603cc
children af5f099d932b
comparison
equal deleted inserted replaced
8386:4aad982111b6 8387:50b6af595e0c
1 created new head 1 created new head
2 changeset: 0:310fd17130da
3 user: test
4 date: Mon Jan 12 13:46:40 1970 +0000
5 summary: add foo
6
7 changeset: 1:7731dad1c2b9
8 user: test
9 date: Mon Jan 12 13:46:40 1970 +0000
10 summary: cp foo bar; change both
11
2 resolving manifests 12 resolving manifests
3 overwrite None partial False 13 overwrite None partial False
4 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 14 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
5 searching for copies back to rev 1 15 searching for copies back to rev 1
6 unmatched files in other: 16 unmatched files in other: