Show More
@@ -144,7 +144,7 b' def submerge(repo, wctx, mctx, actx, ove' | |||||
144 | debug(s, "prompt remove") |
|
144 | debug(s, "prompt remove") | |
145 | wctx.sub(s).remove() |
|
145 | wctx.sub(s).remove() | |
146 |
|
146 | |||
147 | for s, r in s2.items(): |
|
147 | for s, r in sorted(s2.items()): | |
148 | if s in s1: |
|
148 | if s in s1: | |
149 | continue |
|
149 | continue | |
150 | elif s not in sa: |
|
150 | elif s not in sa: |
General Comments 0
You need to be logged in to leave comments.
Login now