Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: help: explain 'man.viewer' multiple values
[gitweb.git]
/
builtin-merge-file.c
diff --git
a/builtin-merge-file.c
b/builtin-merge-file.c
index 58deb62ac08507901c40e89aec0cea7fcdc78f1e..adce6d4635a4153428368073677cd74a9bafc045 100644
(file)
--- 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);