Show More
@@ -237,6 +237,7 b' def submerge(repo, wctx, mctx, actx, ove' | |||||
237 |
|
237 | |||
238 | # record merged .hgsubstate |
|
238 | # record merged .hgsubstate | |
239 | writestate(repo, sm) |
|
239 | writestate(repo, sm) | |
|
240 | return sm | |||
240 |
|
241 | |||
241 | def _updateprompt(ui, sub, dirty, local, remote): |
|
242 | def _updateprompt(ui, sub, dirty, local, remote): | |
242 | if dirty: |
|
243 | if dirty: |
General Comments 0
You need to be logged in to leave comments.
Login now