Show More
| @@ -213,6 +213,7 b' modify x and rename y to z on the other ' | |||
|
|
213 | 213 | ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508 |
|
|
214 | 214 | preserving x for resolve of x |
|
|
215 | 215 | preserving z for resolve of z |
|
|
216 | starting 4 threads for background file closing (?) | |
|
|
216 | 217 | x: prompt changed/deleted -> m (premerge) |
|
|
217 | 218 | picked tool ':prompt' for x (binary False symlink False changedelete True) |
|
|
218 | 219 | file 'x' was deleted in other [merge rev] but was modified in local [working copy]. |
General Comments 0
You need to be logged in to leave comments.
Login now