Mercurial > public > mercurial-scm > hg-stable
diff contrib/simplemerge @ 7080:a6477aa893b8
tests: Windows compatibility fixes
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sun, 12 Oct 2008 19:11:59 +0200 |
| parents | abd66eb0889e |
| children | bb9f13974d8e |
line wrap: on
line diff
--- 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)