Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepo.py @ 9049:38b5d5e0efab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge, subrepo: correct indention
author Martin Geisler <mg@lazybytes.net>
date Tue, 07 Jul 2009 17:26:20 +0200
parents 86b4a9b0ddda
children 9aebeea7ac00
line wrap: on
line diff
--- 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