diff tests/test-simplemerge.py @ 31472:75e4bae56068

config: honour the trusted flag in ui.configbytes
author Martijn Pieters <mjpieters@fb.com>
date Sun, 12 Mar 2017 11:43:31 -0700
parents 2d433fa7ff44
children 68c43a416585
line wrap: on
line diff