Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> ---
> builtin-merge-file.c | 6 +++++-
> t/t6023-merge-file.sh | 5 +++++
> 2 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge-file.c b/builtin-merge-file.c
> index 9135773..10ec63b 100644
> --- a/builtin-merge-file.c
> +++ b/builtin-merge-file.c
> @@ -36,9 +36,13 @@ int cmd_merge_file(int argc, char **argv, char **envp)
> for (; i < 3; i++)
> names[i] = argv[i + 1];
>
> - for (i = 0; i < 3; i++)
> + for (i = 0; i < 3; i++) {
> if (read_mmfile(mmfs + i, argv[i + 1]))
> return -1;
> + if (buffer_is_binary(mmfs[i].ptr, mmfs[i].size))
> + return error("Cannot merge binary files: %s\n",
> + argv[i + 1]);
> + }
>
> ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
> &xpp, XDL_MERGE_ZEALOUS, &result);
Oh, my.
I wonder if we can expose ll_merge() from merge-recursive to
this part, instead of raw xdl_merge(). That would give you the
custom merge driver the user may have specified in
.gitattributes.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
