summaryrefslogtreecommitdiff
path: root/ll-merge.h
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 /ll-merge.h
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 'll-merge.h')
-rw-r--r--ll-merge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h
index aaed46d..5788922 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -12,4 +12,6 @@ int ll_merge(mmbuffer_t *result_buf,
mmfile_t *theirs, const char *their_label,
int flag);
+int ll_merge_marker_size(const char *path);
+
#endif