diff tests/test-merge10.t @ 25835:34ffe4c29782

filemerge: mark internal-only config option
author Matt Mackall <mpm@selenic.com>
date Thu, 25 Jun 2015 17:46:55 -0500
parents f2719b387380
children eb586ed5d8ce
line wrap: on
line diff