equal
deleted
inserted
replaced
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 -r3 |
26 $ hg up -r3 |
27 note: using 0f6b37dbe527 as ancestor of adfe50279922 and cf89f02107e5 |
|
28 alternatively, use --config merge.preferancestor=40663881a6dd |
|
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30 $ echo '6 second change' > f2 |
28 $ echo '6 second change' > f2 |
31 $ hg ci -m '6 second change f2' |
29 $ hg ci -m '6 second change f2' |
32 |
30 |
33 $ hg log -G |
31 $ hg log -G |
167 |
165 |
168 |
166 |
169 The other way around: |
167 The other way around: |
170 |
168 |
171 $ hg up -C -r5 |
169 $ hg up -C -r5 |
172 note: using 0f6b37dbe527 as ancestor of 3b08d01b0ab5 and adfe50279922 |
|
173 alternatively, use --config merge.preferancestor=40663881a6dd |
|
174 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
175 $ hg merge -v --debug --config merge.preferancestor="*" |
171 $ hg merge -v --debug --config merge.preferancestor="*" |
176 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
172 note: merging adfe50279922+ and 3b08d01b0ab5 using bids from ancestors 0f6b37dbe527 and 40663881a6dd |
177 |
173 |
178 calculating bids for ancestor 0f6b37dbe527 |
174 calculating bids for ancestor 0f6b37dbe527 |