changeset 23455 | 265034f4e27c |
parent 23426 | 19ebd2f88fc7 |
child 23456 | e1086c7dd3c4 |
--- a/mercurial/commands.py Tue Nov 18 21:47:47 2014 -0800 +++ b/mercurial/commands.py Tue Nov 18 22:16:46 2014 -0800 @@ -316,7 +316,8 @@ m = scmutil.match(ctx, pats, opts) m.bad = bad follow = not opts.get('no_follow') - diffopts = patch.diffopts(ui, opts, section='annotate') + diffopts = patch.difffeatureopts(ui, opts, section='annotate', + whitespace=True) for abs in ctx.walk(m): fctx = ctx[abs] if not opts.get('text') and util.binary(fctx.data()):