Show More
@@ -212,7 +212,7 b' def manifestmerge(repo, p1, p2, pa, over' | |||||
212 | act("local moved to " + f2, "m", |
|
212 | act("local moved to " + f2, "m", | |
213 | f, f2, f, fmerge(f, f2, f2), False) |
|
213 | f, f2, f, fmerge(f, f2, f2), False) | |
214 | elif f in ma and not n[20:]: |
|
214 | elif f in ma and not n[20:]: | |
215 |
if n != ma[f] |
|
215 | if n != ma[f]: | |
216 | if repo.ui.prompt( |
|
216 | if repo.ui.prompt( | |
217 | _(" local changed %s which remote deleted\n" |
|
217 | _(" local changed %s which remote deleted\n" | |
218 | "use (c)hanged version or (d)elete?") % f, |
|
218 | "use (c)hanged version or (d)elete?") % f, |
General Comments 0
You need to be logged in to leave comments.
Login now