Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Documentation/Makefile: add *.pdf to `clean' target
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 981ed6ac94b5ed73f15a3b0dca723586374ca0b8..7e1e972b13cb8a9f2fae084f769fffede24c8dbb 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-20,6
+20,8
@@
struct merge_options {
int diff_rename_limit;
int merge_rename_limit;
int rename_score;
+ int needed_rename_limit;
+ int show_rename_progress;
int call_depth;
struct strbuf obuf;
struct string_list current_file_set;