Mercurial > hg

diff tests/test-merge-criss-cross.t @ 25363:3ff4b07412ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ui: flush stdout before writing traceback to stderr Sometimes a traceback message is paired with ui.debug(). This patch makes sure that these messages are displayed in the right order.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 31 May 2015 14:40:28 +0900
parents bd625cd4e5e7
children d8463a743d7d
line wrap: on
line diff