diff options
Diffstat (limited to 'll-merge.h')
-rw-r--r-- | ll-merge.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ int ll_merge(mmbuffer_t *result_buf, const char *path, - mmfile_t *ancestor, + mmfile_t *ancestor, const char *ancestor_label, mmfile_t *ours, const char *our_label, mmfile_t *theirs, const char *their_label, int flag); |