diff mercurial/help/merge-tools.txt @ 25423:525fbf24b51b

bundle2: stop capturing output for ssh again This backout 36111f98f23d since we can have real time output with ssh again. The tests change is not backed-out because it was a test output fix.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 20 May 2015 11:44:06 -0500
parents 38e0363dcbe0
children 247bb7a2c492
line wrap: on
line diff