XDL_MERGE_DIFF3 34 builtin/merge-file.c OPT_SET_INT(0, "diff3", &xmp.style, N_("use a diff3 based merge"), XDL_MERGE_DIFF3), XDL_MERGE_DIFF3 313 xdiff-interface.c git_xmerge_style = XDL_MERGE_DIFF3; XDL_MERGE_DIFF3 180 xdiff/xmerge.c if (style == XDL_MERGE_DIFF3) { XDL_MERGE_DIFF3 423 xdiff/xmerge.c if (style == XDL_MERGE_DIFF3) {