diff hgmerge @ 4406:1ef4445c6506

simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
author Patrick Mezard <pmezard@gmail.com>
date Sun, 06 May 2007 16:40:53 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff