diff mercurial/merge.py @ 38532:9ee202679a76

test: stop passing --quiet in a run dedicated to debug output The goal of the run is to display some debug output. Passing --quiet in this case is strange.
author Boris Feld <boris.feld@octobus.net>
date Tue, 19 Jun 2018 19:10:31 +0100
parents d4be8ea8f22d
children be4984261611
line wrap: on
line diff