diff mercurial/merge.py @ 17964:2c63896783e3 stable

hooks: be even more forgiven of non-fd descriptors (issue3711) Looks like there are instances where sys.stdout/stderr contain file handles that are invalid. We should be tolerant of this for hook I/O redirection, as our primary concern is not garbling our own output stream.
author Matt Mackall <mpm@selenic.com>
date Mon, 26 Nov 2012 17:48:39 -0600
parents ce7bc04d863b
children 5881d5b7552f
line wrap: on
line diff