diff mercurial/merge.py @ 32986:2529e2ae9f4c

configitems: register 'ui.quiet' as first example We now have a user and this works fine.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 17 Jun 2017 12:33:59 +0200
parents 9e3733d93f64
children 6582dc01aca3
line wrap: on
line diff