diff mercurial/merge.py @ 39308:9b800601701c

help: inline minirst.format() I'm going to make minirst.format() always returns a formatted text, not text | (text, pruned).
author Yuya Nishihara <yuya@tcha.org>
date Sun, 05 Aug 2018 12:06:07 +0900
parents d49e490a9e85
children 7fea205fd5dc
line wrap: on
line diff