comparison tests/test-issue586.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 4591cd6b6794
children eb586ed5d8ce
comparison
equal deleted inserted replaced
33827:db3e9f7c91aa 33828:8b91a4ff23ad