diff --git a/ll-merge.h b/ll-merge.h
index 5388422d091ede134d42406291989c49553f7428..aaed46dec9dabcd7adc614ded30086f61cdf7b48 100644 (file)
--- a/ll-merge.h
+++ b/ll-merge.h
mmfile_t *ancestor,
mmfile_t *ours, const char *our_label,
mmfile_t *theirs, const char *their_label,
- int virtual_ancestor);
+ int flag);
#endif