Changeset b7fef7ac13cd…
Parent 14bf0e427178…
by
Changes to one file · Browse files at b7fef7ac13cd Showing diff from parent 14bf0e427178 Diff from another changeset...
@@ -310,7 +310,7 @@
# if both --change and --rev is given, remove --rev in 3-way mode,
# and --change in normal mode
- if 'change' in opts and 'rev' in opts:
+ if 'change' in opts and opts.get('rev'):
if '$parent2' in ''.join(diffopts):
del opts['rev']
else:
|
Loading...