diff tests/test-revlog-ancestry.py.out @ 33829:b86fc43e4b73

simplemerge: write merge result to the localctx, if passed Differential Revision: https://phab.mercurial-scm.org/D375
author Phil Cohen <phillco@fb.com>
date Sun, 13 Aug 2017 22:46:03 -0700
parents f88c60e740a1
children b6db2e80a9ce
line wrap: on
line diff