-int show_combined_diff(struct combine_diff_path *elem, int num_parent,
- int dense, const char *header, int show_empty);
+extern int show_combined_diff(struct combine_diff_path *elem, int num_parent,
+ int dense, const char *header,
+ struct diff_options *);