From 8588567c96490b8d236b1bc13f9bcb0dfa118efe Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 16 Jan 2010 23:28:46 -0800
Subject: rerere: honor conflict-marker-size attribute

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 ll-merge.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'll-merge.h')

diff --git a/ll-merge.h b/ll-merge.h
index 5388422d0..ff5d84a34 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 virtual_ancestor);
 
+int ll_merge_marker_size(const char *path);
+
 #endif
-- 
cgit v1.2.1