diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-27 11:57:19 -0800 |
| commit | cb99be7c7d2afc71106ffaf400c769c8e72f1bb2 (patch) | |
| tree | 66a78ff99d45bf4c9c1dba5867c48c08b0b44df5 /builtin-merge-file.c | |
| parent | 722f53ca2feed5e41c2270fdaae25bde5b7582f4 (diff) | |
| parent | ee95ec5d58d536243966de6ee810d345074b755e (diff) | |
| download | git-cb99be7c7d2afc71106ffaf400c769c8e72f1bb2.tar.gz | |
Merge branch 'js/merge'
* js/merge:
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Diffstat (limited to 'builtin-merge-file.c')
| -rw-r--r-- | builtin-merge-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-file.c b/builtin-merge-file.c index 58deb62ac0..adce6d4635 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); |