Merge branch 'master'

diff --git a/diffcore.h b/diffcore.h
index f1b5ca748cae8d40f599552c3605080808da7803..a38acb13e19e0b3bfe9a377fefe4810c9830a11e 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -85,7 +85,7 @@ extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
 
 extern void diffcore_pathspec(const char **pathspec);
 extern void diffcore_break(int);
-extern void diffcore_rename(int rename_copy, int);
+extern void diffcore_rename(struct diff_options *);
 extern void diffcore_merge_broken(void);
 extern void diffcore_pickaxe(const char *needle, int opts);
 extern void diffcore_order(const char *orderfile);