changeset 30342 | 318a24b52eeb |
parent 30286 | 3d38a0bc774f |
child 30350 | 608ba935e041 |
--- a/mercurial/cmdutil.py Thu Nov 03 17:31:14 2016 -0700 +++ b/mercurial/cmdutil.py Mon Oct 17 23:16:55 2016 +0200 @@ -3471,7 +3471,7 @@ '''Check for an unfinished operation and return the command to finish it. - afterresolvedstates tupples define a .hg/{file} and the corresponding + afterresolvedstates tuples define a .hg/{file} and the corresponding command needed to finish it. Returns a (msg, warning) tuple. 'msg' is a string and 'warning' is