comparison tests/test-trusted.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 75e4bae56068
children 73ccba60aaa1
comparison
equal deleted inserted replaced
33828:8b91a4ff23ad 33829:b86fc43e4b73