equal
deleted
inserted
replaced
3469 |
3469 |
3470 def howtocontinue(repo): |
3470 def howtocontinue(repo): |
3471 '''Check for an unfinished operation and return the command to finish |
3471 '''Check for an unfinished operation and return the command to finish |
3472 it. |
3472 it. |
3473 |
3473 |
3474 afterresolvedstates tupples define a .hg/{file} and the corresponding |
3474 afterresolvedstates tuples define a .hg/{file} and the corresponding |
3475 command needed to finish it. |
3475 command needed to finish it. |
3476 |
3476 |
3477 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is |
3477 Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is |
3478 a boolean. |
3478 a boolean. |
3479 ''' |
3479 ''' |