diff mercurial/merge.py @ 10789:1b45468d3deb stable

util.termwidth: check stderr first as it's least likely to be redirected
author Augie Fackler <durin42@gmail.com>
date Mon, 15 Mar 2010 14:53:34 -0500
parents 0e64d814d7d0
children 7a0d096e221e
line wrap: on
line diff