Show More
@@ -353,6 +353,7 b' def _checkcollision(repo, wmf, actions):' | |||||
353 | "dg": renamegetop, |
|
353 | "dg": renamegetop, | |
354 | "dr": nop, |
|
354 | "dr": nop, | |
355 | "e": nop, |
|
355 | "e": nop, | |
|
356 | "k": nop, | |||
356 | "f": addop, # untracked file should be kept in working directory |
|
357 | "f": addop, # untracked file should be kept in working directory | |
357 | "g": addop, |
|
358 | "g": addop, | |
358 | "m": mergeop, |
|
359 | "m": mergeop, |
General Comments 0
You need to be logged in to leave comments.
Login now