diff options
Diffstat (limited to 'll-merge.h')
| -rw-r--r-- | ll-merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ll-merge.h b/ll-merge.h index ff5d84a345..57889227b1 100644 --- a/ll-merge.h +++ b/ll-merge.h @@ -10,7 +10,7 @@ int ll_merge(mmbuffer_t *result_buf, mmfile_t *ancestor, mmfile_t *ours, const char *our_label, mmfile_t *theirs, const char *their_label, - int virtual_ancestor); + int flag); int ll_merge_marker_size(const char *path); |