equal
deleted
inserted
replaced
241 pl = repo.parents() |
241 pl = repo.parents() |
242 repo.ui.status(_("There are unresolved merges," |
242 repo.ui.status(_("There are unresolved merges," |
243 " you can redo the full merge using:\n" |
243 " you can redo the full merge using:\n" |
244 " hg update -C %s\n" |
244 " hg update -C %s\n" |
245 " hg merge %s\n") |
245 " hg merge %s\n") |
246 % (pl[0].rev(), pl[1].rev())) |
246 % (pl[0].rev(), pl[1].rev())) |
247 elif remind: |
247 elif remind: |
248 repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
248 repo.ui.status(_("(branch merge, don't forget to commit)\n")) |
249 return stats[3] |
249 return stats[3] |
250 |
250 |
251 def revert(repo, node, choose, wlock): |
251 def revert(repo, node, choose, wlock): |