Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
36763:90f8fe72446c 36764:3cf40112efb7
848 if sys.platform == 'darwin': 848 if sys.platform == 'darwin':
849 osutil_ldflags += ['-framework', 'ApplicationServices'] 849 osutil_ldflags += ['-framework', 'ApplicationServices']
850 850
851 xdiff_srcs = [ 851 xdiff_srcs = [
852 'mercurial/thirdparty/xdiff/xdiffi.c', 852 'mercurial/thirdparty/xdiff/xdiffi.c',
853 'mercurial/thirdparty/xdiff/xmerge.c',
854 'mercurial/thirdparty/xdiff/xprepare.c', 853 'mercurial/thirdparty/xdiff/xprepare.c',
855 'mercurial/thirdparty/xdiff/xutils.c', 854 'mercurial/thirdparty/xdiff/xutils.c',
856 ] 855 ]
857 856
858 xdiff_headers = [ 857 xdiff_headers = [