diff tests/test-no-symlinks.t @ 33828:8b91a4ff23ad

simplemerge: use contexts to read file data from, if passed Differential Revision: https://phab.mercurial-scm.org/D374
author Phil Cohen <phillco@fb.com>
date Sun, 13 Aug 2017 20:06:52 -0700
parents 7a9cbb315d84
children 2d49d2eb1ff2
line wrap: on
line diff