Mercurial > hg > mercurial-crew-with-dirclash
comparison hgext/imerge.py @ 5117:d4fa6bafc43a
Remove trailing spaces, fix indentation
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 07 Aug 2007 10:28:43 +0200 |
parents | 12930b97a729 |
children | 1d5ebb0d366f |
comparison
equal
deleted
inserted
replaced
5116:2ffe3e2a1ac2 | 5117:d4fa6bafc43a |
---|---|
338 im.resume() | 338 im.resume() |
339 else: | 339 else: |
340 rev = opts.get('rev') | 340 rev = opts.get('rev') |
341 if rev and args: | 341 if rev and args: |
342 raise util.Abort('please specify just one revision') | 342 raise util.Abort('please specify just one revision') |
343 | 343 |
344 if len(args) == 2 and args[0] == 'load': | 344 if len(args) == 2 and args[0] == 'load': |
345 pass | 345 pass |
346 else: | 346 else: |
347 if args: | 347 if args: |
348 rev = args[0] | 348 rev = args[0] |