xdmerge_t          50 xdiff/xmerge.c static int xdl_append_merge(xdmerge_t **merge, int mode,
xdmerge_t          55 xdiff/xmerge.c 	xdmerge_t *m = *merge;
xdmerge_t          63 xdiff/xmerge.c 		m = xdl_malloc(sizeof(xdmerge_t));
xdmerge_t          81 xdiff/xmerge.c static int xdl_cleanup_merge(xdmerge_t *c)
xdmerge_t          84 xdiff/xmerge.c 	xdmerge_t *next_c;
xdmerge_t         150 xdiff/xmerge.c 			      xdmerge_t *m, char *dest, int marker_size)
xdmerge_t         228 xdiff/xmerge.c 				 xdmerge_t *m, char *dest, int style,
xdmerge_t         267 xdiff/xmerge.c static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
xdmerge_t         314 xdiff/xmerge.c 			xdmerge_t *m2 = xdl_malloc(sizeof(xdmerge_t));
xdmerge_t         357 xdiff/xmerge.c static void xdl_merge_two_conflicts(xdmerge_t *m)
xdmerge_t         359 xdiff/xmerge.c 	xdmerge_t *next_m = m->next;
xdmerge_t         371 xdiff/xmerge.c static int xdl_simplify_non_conflicts(xdfenv_t *xe1, xdmerge_t *m,
xdmerge_t         379 xdiff/xmerge.c 		xdmerge_t *next_m = m->next;
xdmerge_t         413 xdiff/xmerge.c 	xdmerge_t *changes, *c;