changeset 24102 | 00280a2b8b9a |
parent 24101 | 1ea90d140ee3 |
child 24103 | c666c85f71ba |
--- a/mercurial/patch.py Thu Jan 22 22:42:35 2015 -0800 +++ b/mercurial/patch.py Fri Feb 06 15:21:56 2015 -0800 @@ -1776,7 +1776,6 @@ flag2 = None content1 = None content2 = None - binary = False copyop = None if f not in addedset: content1 = getfilectx(f, ctx1).data() @@ -1810,6 +1809,8 @@ flag1 = ctx1.flags(f) flag2 = ctx2.flags(f) + binary = False + if opts.git or losedatafn: binary = util.binary(content1) or util.binary(content2) if losedatafn and not opts.git: