summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-21 04:28:51 (GMT)
commit06dbc1ea5768618337bf11e5f64c4f9f14a68008 (patch)
tree049d23a7b372994b77c192df0537b232daa10d07 /convert.c
parentdf91d0e4d30ddc9bf2c55e3a63be9cb5318a409a (diff)
parent8588567c96490b8d236b1bc13f9bcb0dfa118efe (diff)
downloadgit-06dbc1ea5768618337bf11e5f64c4f9f14a68008.zip
git-06dbc1ea5768618337bf11e5f64c4f9f14a68008.tar.gz
git-06dbc1ea5768618337bf11e5f64c4f9f14a68008.tar.bz2
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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/convert.c b/convert.c
index 950b1f9..27acce5 100644
--- a/convert.c
+++ b/convert.c
@@ -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);
}