diff -r 69c773750055 -r 5a5bd7614401 mercurial/subrepo.py
--- a/mercurial/subrepo.py	Thu Feb 17 09:19:15 2011 +0100
+++ b/mercurial/subrepo.py	Thu Feb 17 09:20:44 2011 +0100
@@ -886,7 +886,8 @@
         if self.dirty():
             if self._gitstate() != revision:
                 dirty = self._gitstate() == self._state[1] or code != 0
-                if _updateprompt(self._ui, self, dirty, self._state[1][:7], revision[:7]):
+                if _updateprompt(self._ui, self, dirty,
+                                 self._state[1][:7], revision[:7]):
                     mergefunc()
         else:
             mergefunc()