diff mercurial/merge.py @ 38585:c6398fc2fc9c

synthrepo: simply use the ui passed as a function argument
author Yuya Nishihara <yuya@tcha.org>
date Fri, 06 Jul 2018 21:31:04 +0900
parents d4be8ea8f22d
children be4984261611
line wrap: on
line diff