equal
deleted
inserted
replaced
211 resolving manifests |
211 resolving manifests |
212 branchmerge: True, force: False, partial: False |
212 branchmerge: True, force: False, partial: False |
213 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
213 ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
214 preserving x for resolve of x |
214 preserving x for resolve of x |
215 preserving z for resolve of z |
215 preserving z for resolve of z |
|
216 starting 4 threads for background file closing (?) |
216 x: prompt changed/deleted -> m (premerge) |
217 x: prompt changed/deleted -> m (premerge) |
217 picked tool ':prompt' for x (binary False symlink False changedelete True) |
218 picked tool ':prompt' for x (binary False symlink False changedelete True) |
218 file 'x' was deleted in other [merge rev] but was modified in local [working copy]. |
219 file 'x' was deleted in other [merge rev] but was modified in local [working copy]. |
219 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
220 You can use (c)hanged version, (d)elete, or leave (u)nresolved. |
220 What do you want to do? u |
221 What do you want to do? u |