--- 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