##// END OF EJS Templates
xdiff: remove xmerge related logic...
Jun Wu -
r36782:3cf40112 default
parent child Browse files
Show More
@@ -38,20 +38,6 b' extern "C" {'
38 38 * (a1, a2 - a1, b1, b2 - b1) hunks */
39 39 #define XDL_EMIT_BDIFFHUNK (1 << 4)
40 40
41 /* merge simplification levels */
42 #define XDL_MERGE_MINIMAL 0
43 #define XDL_MERGE_EAGER 1
44 #define XDL_MERGE_ZEALOUS 2
45 #define XDL_MERGE_ZEALOUS_ALNUM 3
46
47 /* merge favor modes */
48 #define XDL_MERGE_FAVOR_OURS 1
49 #define XDL_MERGE_FAVOR_THEIRS 2
50 #define XDL_MERGE_FAVOR_UNION 3
51
52 /* merge output styles */
53 #define XDL_MERGE_DIFF3 1
54
55 41 typedef struct s_mmfile {
56 42 char *ptr;
57 43 long size;
@@ -90,22 +76,6 b' long xdl_mmfile_size(mmfile_t *mmf);'
90 76 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
91 77 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
92 78
93 typedef struct s_xmparam {
94 xpparam_t xpp;
95 int marker_size;
96 int level;
97 int favor;
98 int style;
99 const char *ancestor; /* label for orig */
100 const char *file1; /* label for mf1 */
101 const char *file2; /* label for mf2 */
102 } xmparam_t;
103
104 #define DEFAULT_CONFLICT_MARKER_SIZE 7
105
106 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
107 xmparam_t const *xmp, mmbuffer_t *result);
108
109 79 #ifdef __cplusplus
110 80 }
111 81 #endif /* #ifdef __cplusplus */
@@ -850,7 +850,6 b" if sys.platform == 'darwin':"
850 850
851 851 xdiff_srcs = [
852 852 'mercurial/thirdparty/xdiff/xdiffi.c',
853 'mercurial/thirdparty/xdiff/xmerge.c',
854 853 'mercurial/thirdparty/xdiff/xprepare.c',
855 854 'mercurial/thirdparty/xdiff/xutils.c',
856 855 ]
1 NO CONTENT: file was removed
This diff has been collapsed as it changes many lines, (686 lines changed) Show them Hide them
General Comments 0
You need to be logged in to leave comments. Login now