changeset 7080 | a6477aa893b8 |
parent 6002 | abd66eb0889e |
child 8269 | bb9f13974d8e |
--- a/contrib/simplemerge Sun Oct 12 19:11:56 2008 +0200 +++ b/contrib/simplemerge Sun Oct 12 19:11:59 2008 +0200 @@ -42,6 +42,9 @@ sys.stdout.write(' %-*s %s\n' % (opts_len, first, second)) try: + for fp in (sys.stdin, sys.stdout, sys.stderr): + util.set_binary(fp) + opts = {} try: args = fancyopts.fancyopts(sys.argv[1:], options, opts)