summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-17 07:28:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-17 10:01:43 (GMT)
commit8588567c96490b8d236b1bc13f9bcb0dfa118efe (patch)
tree5c5f026346ef69293b14419028f15ecf39d5701d /ll-merge.h
parent191f24171718e894cb5ba806bc45861ebac95e96 (diff)
downloadgit-8588567c96490b8d236b1bc13f9bcb0dfa118efe.zip
git-8588567c96490b8d236b1bc13f9bcb0dfa118efe.tar.gz
git-8588567c96490b8d236b1bc13f9bcb0dfa118efe.tar.bz2
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 5388422..ff5d84a 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