diff tests/test-merge4.t @ 35207:d210723b73e5

lock: use configint for 'ui.timeout' config The ui object can do the conversion itself.
author Boris Feld <boris.feld@octobus.net>
date Wed, 29 Nov 2017 21:00:02 -0500
parents 63c817ea4a70
children 8561ad49915d
line wrap: on
line diff