equal
deleted
inserted
replaced
245 src: 'c' -> dst: 'b' |
245 src: 'c' -> dst: 'b' |
246 checking for directory renames |
246 checking for directory renames |
247 resolving manifests |
247 resolving manifests |
248 branchmerge: True, force: True, partial: False |
248 branchmerge: True, force: True, partial: False |
249 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
249 ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
250 preserving e for resolve of e |
|
251 d: remote is newer -> g |
250 d: remote is newer -> g |
252 getting d |
251 getting d |
|
252 preserving e for resolve of e |
253 e: versions differ -> m (premerge) |
253 e: versions differ -> m (premerge) |
254 picked tool ':merge' for e (binary False symlink False changedelete False) |
254 picked tool ':merge' for e (binary False symlink False changedelete False) |
255 merging e |
255 merging e |
256 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
256 my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304 |
257 e: versions differ -> m (merge) |
257 e: versions differ -> m (merge) |