Mercurial Mercurial > hg-stable / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
setup.py
changeset 36772 3cf40112efb7
parent 36771 90f8fe72446c
child 37133 a1d2d0420e22 
--- 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',
 ]
hg-stable