diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-01-21 05:28:51 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 05:28:51 +0100 |
commit | 06dbc1ea5768618337bf11e5f64c4f9f14a68008 (patch) | |
tree | 049d23a7b372994b77c192df0537b232daa10d07 /convert.c | |
parent | Merge branch 'ag/maint-apply-too-large-p' (diff) | |
parent | rerere: honor conflict-marker-size attribute (diff) | |
download | git-06dbc1ea5768618337bf11e5f64c4f9f14a68008.tar.xz git-06dbc1ea5768618337bf11e5f64c4f9f14a68008.zip |
Merge branch 'jc/conflict-marker-size'
* jc/conflict-marker-size:
rerere: honor conflict-marker-size attribute
rerere: prepare for customizable conflict marker length
conflict-marker-size: new attribute
rerere: use ll_merge() instead of using xdl_merge()
merge-tree: use ll_merge() not xdl_merge()
xdl_merge(): allow passing down marker_size in xmparam_t
xdl_merge(): introduce xmparam_t for merge specific parameters
git_attr(): fix function signature
Conflicts:
builtin-merge-file.c
ll-merge.c
xdiff/xdiff.h
xdiff/xmerge.c
Diffstat (limited to 'convert.c')
-rw-r--r-- | convert.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -378,9 +378,9 @@ static void setup_convert_check(struct git_attr_check *check) static struct git_attr *attr_filter; if (!attr_crlf) { - attr_crlf = git_attr("crlf", 4); - attr_ident = git_attr("ident", 5); - attr_filter = git_attr("filter", 6); + attr_crlf = git_attr("crlf"); + attr_ident = git_attr("ident"); + attr_filter = git_attr("filter"); user_convert_tail = &user_convert; git_config(read_convert_config, NULL); } |