XDL_MERGE_FAVOR_OURS 36 builtin/merge-file.c XDL_MERGE_FAVOR_OURS), XDL_MERGE_FAVOR_OURS 60 ll-merge.c case XDL_MERGE_FAVOR_OURS: XDL_MERGE_FAVOR_OURS 848 merge-recursive.c ll_opts.variant = XDL_MERGE_FAVOR_OURS;