Mercurial > hg
comparison mercurial/hg.py @ 3680:69cf255a55a1
Indentation cleanups for 2956948b81f3.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sun, 19 Nov 2006 16:09:04 +0100 |
| parents | 2956948b81f3 |
| children | 8ae88ed2a3b6 |
comparison
equal
deleted
inserted
replaced
| 3679:2956948b81f3 | 3680:69cf255a55a1 |
|---|---|
| 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): |