Mercurial > hg
diff tests/hghave.py @ 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 | 4d1e79945c2e |
children | dbf83230e8be |