Mercurial > public > mercurial-scm > hg

diff setup.py @ 36764:3cf40112efb7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 90f8fe72446c
children a1d2d0420e22
line wrap: on
line diff
--- a/setup.py	Tue Mar 06 18:41:08 2018 -0800
+++ b/setup.py	Tue Mar 06 18:51:11 2018 -0800
@@ -850,7 +850,6 @@
 
 xdiff_srcs = [
     'mercurial/thirdparty/xdiff/xdiffi.c',
-    'mercurial/thirdparty/xdiff/xmerge.c',
     'mercurial/thirdparty/xdiff/xprepare.c',
     'mercurial/thirdparty/xdiff/xutils.c',
 ]