diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-17 08:28:46 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-17 11:01:43 +0100 |
| commit | 8588567c96490b8d236b1bc13f9bcb0dfa118efe (patch) | |
| tree | 5c5f026346ef69293b14419028f15ecf39d5701d /ll-merge.h | |
| parent | rerere: prepare for customizable conflict marker length (diff) | |
| download | git-8588567c96490b8d236b1bc13f9bcb0dfa118efe.tar.xz git-8588567c96490b8d236b1bc13f9bcb0dfa118efe.zip | |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ll-merge.h b/ll-merge.h index 5388422d09..ff5d84a345 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 |