diff contrib/hgweb.wsgi @ 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 4b0fc75f9403
children d58a205d0672
line wrap: on
line diff