diff mercurial/simplemerge.py @ 30324:cb1ea3cc44b5

progress: obtain stderr from ui This will help Python 3 porting.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 20 Oct 2016 22:12:48 +0900
parents 5f7d13d3bd4d
children 318a24b52eeb
line wrap: on
line diff