Show More
@@ -222,7 +222,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
222 | act("prompt keep", "a", f) |
|
222 | act("prompt keep", "a", f) | |
223 | else: |
|
223 | else: | |
224 | act("other deleted", "r", f) |
|
224 | act("other deleted", "r", f) | |
225 | elif overwrite and n[20:] == "a": # do not erase the working copy |
|
225 | elif n[20:] == "a": # only forget locally-added | |
226 | act("remote deleted", "f", f) |
|
226 | act("remote deleted", "f", f) | |
227 | else: |
|
227 | else: | |
228 | # file is created on branch or in working directory |
|
228 | # file is created on branch or in working directory |
General Comments 0
You need to be logged in to leave comments.
Login now