X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-merge-file.c;h=adce6d4635a4153428368073677cd74a9bafc045;hb=dabc42c7134596092bf59adb83c79b09f729c290;hp=58deb62ac08507901c40e89aec0cea7fcdc78f1e;hpb=c1c10a3f272ec0908e63bc105a5ffe94c1279fba;p=git.git

diff --git a/builtin-merge-file.c b/builtin-merge-file.c
index 58deb62ac..adce6d463 100644
--- a/builtin-merge-file.c
+++ b/builtin-merge-file.c
@@ -46,7 +46,7 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
 	}
 
 	ret = xdl_merge(mmfs + 1, mmfs + 0, names[0], mmfs + 2, names[2],
-			&xpp, XDL_MERGE_ZEALOUS, &result);
+			&xpp, XDL_MERGE_ZEALOUS_ALNUM, &result);
 
 	for (i = 0; i < 3; i++)
 		free(mmfs[i].ptr);