equal
deleted
inserted
replaced
21 $ hg ci -qm '4 merge' |
21 $ hg ci -qm '4 merge' |
22 |
22 |
23 $ echo '5 second change' > f1 |
23 $ echo '5 second change' > f1 |
24 $ hg ci -m '5 second change f1' |
24 $ hg ci -m '5 second change f1' |
25 |
25 |
26 $ hg up -qr3 |
26 $ hg up -r3 |
|
27 note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5 |
|
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 $ echo '6 second change' > f2 |
29 $ echo '6 second change' > f2 |
28 $ hg ci -m '6 second change f2' |
30 $ hg ci -m '6 second change f2' |
29 |
31 |
30 $ hg log -G |
32 $ hg log -G |
31 @ changeset: 6:3b08d01b0ab5 |
33 @ changeset: 6:3b08d01b0ab5 |
70 date: Thu Jan 01 00:00:00 1970 +0000 |
72 date: Thu Jan 01 00:00:00 1970 +0000 |
71 summary: 0 base |
73 summary: 0 base |
72 |
74 |
73 |
75 |
74 $ hg merge -v --debug --tool internal:dump 5 |
76 $ hg merge -v --debug --tool internal:dump 5 |
|
77 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
75 searching for copies back to rev 3 |
78 searching for copies back to rev 3 |
76 resolving manifests |
79 resolving manifests |
77 branchmerge: True, force: False, partial: False |
80 branchmerge: True, force: False, partial: False |
78 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
81 ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
79 f1: remote is newer -> g |
82 f1: remote is newer -> g |