merge-file: add option to select union merge favor

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index fec15cc1ff3c44f056273e1a5ddfdb79e1b1e441..69cc683332a04ddc6959fcef3d2853ccfb2860b8 100644 (file)
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -36,6 +36,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
                            XDL_MERGE_FAVOR_OURS),
                OPT_SET_INT(0, "theirs", &xmp.favor, "for conflicts, use their version",
                            XDL_MERGE_FAVOR_THEIRS),
+               OPT_SET_INT(0, "union", &xmp.favor, "for conflicts, use a union version",
+                           XDL_MERGE_FAVOR_UNION),
                OPT_INTEGER(0, "marker-size", &xmp.marker_size,
                            "for conflicts, use this marker size"),
                OPT__QUIET(&quiet),