# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1246980380 -7200
# Node ID 38b5d5e0efaba61390346ec0d0499479be7df2d1
# Parent  86b4a9b0dddaab2f826b8811bb7f5a4426fb035d
filemerge, subrepo: correct indention

diff -r 86b4a9b0ddda -r 38b5d5e0efab mercurial/filemerge.py
--- 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"):
diff -r 86b4a9b0ddda -r 38b5d5e0efab mercurial/subrepo.py
--- a/mercurial/subrepo.py	Sun Jun 21 01:13:19 2009 +0200
+++ b/mercurial/subrepo.py	Tue Jul 07 17:26:20 2009 +0200
@@ -82,7 +82,7 @@
             if repo.ui.promptchoice(
                 _(' local changed subrepository %s which remote removed\n'
                   'use (c)hanged version or (d)elete?') % s,
-                  (_('&Changed'), _('&Delete')), 0):
+                (_('&Changed'), _('&Delete')), 0):
                 wctx.sub(s).remove()
 
     for s, r in s2.items():
@@ -95,7 +95,7 @@
             if repo.ui.promptchoice(
                 _(' remote changed subrepository %s which local removed\n'
                   'use (c)hanged version or (d)elete?') % s,
-                  (_('&Changed'), _('&Delete')), 0) == 0:
+                (_('&Changed'), _('&Delete')), 0) == 0:
                 wctx.sub(s).get(r)
                 sm[s] = r