changeset 31821 | 66a9faadbc83 |
parent 31715 | 6c80f985a13c |
child 31822 | fde4822b0102 |
--- a/mercurial/patch.py Wed Apr 05 00:34:58 2017 +0900 +++ b/mercurial/patch.py Wed Apr 05 15:15:06 2017 -0700 @@ -2552,7 +2552,7 @@ elif revs and not repo.ui.quiet: header.append(diffline(path1, revs)) - if binary and opts.git and not opts.nobinary: + if binary and opts.git and not opts.nobinary and not opts.text: text = mdiff.b85diff(content1, content2) if text: header.append('index %s..%s' %