Mercurial > hg

diff hgext/largefiles/overrides.py @ 17299:e51d4aedace9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: indent 4 spaces in py files
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 31 Jul 2012 03:30:42 +0200
parents eac3f9c2f9c5
children e7cfe3587ea4 a0ee6d846185 98d6a10bc401
line wrap: on
line diff
--- a/hgext/largefiles/overrides.py	Sat Jul 28 13:33:06 2012 +0200
+++ b/hgext/largefiles/overrides.py	Tue Jul 31 03:30:42 2012 +0200
@@ -667,9 +667,9 @@
         repo._isrebasing = True
         try:
             if opts.get('update'):
-                 del opts['update']
-                 ui.debug('--update and --rebase are not compatible, ignoring '
-                          'the update flag\n')
+                del opts['update']
+                ui.debug('--update and --rebase are not compatible, ignoring '
+                         'the update flag\n')
             del opts['rebase']
             cmdutil.bailifchanged(repo)
             origpostincoming = commands.postincoming