diff tests/test-issue660.t @ 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 2fc86d92c4a9
children 4441705b7111
line wrap: on
line diff