Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 9049:38b5d5e0efab
filemerge, subrepo: correct indention
| author | Martin Geisler <mg@lazybytes.net> |
|---|---|
| date | Tue, 07 Jul 2009 17:26:20 +0200 |
| parents | 86b4a9b0ddda |
| children | 4c041f1ee1b4 |
line wrap: on
line diff
--- a/mercurial/filemerge.py Sun Jun 21 01:13:19 2009 +0200 +++ b/mercurial/filemerge.py Tue Jul 07 17:26:20 2009 +0200 @@ -146,8 +146,8 @@ if not tool or tool == 'internal:prompt': tool = "internal:local" if ui.promptchoice(_(" no tool found to merge %s\n" - "keep (l)ocal or take (o)ther?") % fd, - (_("&Local"), _("&Other")), 0): + "keep (l)ocal or take (o)ther?") % fd, + (_("&Local"), _("&Other")), 0): tool = "internal:other" if tool == "internal:local": return 0 @@ -214,8 +214,8 @@ if not r and _toolbool(ui, tool, "checkchanged"): if filecmp.cmp(repo.wjoin(fd), back): if ui.promptchoice(_(" output file %s appears unchanged\n" - "was merge successful (yn)?") % fd, - (_("&Yes"), _("&No")), 1): + "was merge successful (yn)?") % fd, + (_("&Yes"), _("&No")), 1): r = 1 if _toolbool(ui, tool, "fixeol"):