Show More
@@ -3408,7 +3408,10 b' def command(table):' | |||||
3408 |
|
3408 | |||
3409 | return cmd |
|
3409 | return cmd | |
3410 |
|
3410 | |||
3411 | checkunresolved = mergeutil.checkunresolved |
|
3411 | def checkunresolved(ms): | |
|
3412 | ms._repo.ui.deprecwarn('checkunresolved moved from cmdutil to mergeutil', | |||
|
3413 | '4.1') | |||
|
3414 | return mergeutil.checkunresolved(ms) | |||
3412 |
|
3415 | |||
3413 | # a list of (ui, repo, otherpeer, opts, missing) functions called by |
|
3416 | # a list of (ui, repo, otherpeer, opts, missing) functions called by | |
3414 | # commands.outgoing. "missing" is "missing" of the result of |
|
3417 | # commands.outgoing. "missing" is "missing" of the result of |
General Comments 0
You need to be logged in to leave comments.
Login now