summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index ef0dfe287a..0f1ed5877a 100644
--- a/diff.h
+++ b/diff.h
@@ -43,12 +43,15 @@ extern void diffcore_pickaxe(const char *needle, int opts);
extern void diffcore_pathspec(const char **pathspec);
-extern void diffcore_break(int);
+extern void diffcore_order(const char *orderfile);
+
+extern void diffcore_break(int max_score);
extern void diffcore_std(const char **paths,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
- int break_opt);
+ int break_opt,
+ const char *orderfile);
extern int diff_queue_is_empty(void);