diff COPYING @ 36764:3cf40112efb7

xdiff: remove xmerge related logic hg has its own merge algorithm with flexible config options. Differential Revision: https://phab.mercurial-scm.org/D2706
author Jun Wu <quark@fb.com>
date Tue, 06 Mar 2018 18:51:11 -0800
parents 8c8b55733cbd
children
line wrap: on
line diff