Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
bisect: visualize with git-log if gitk is unavailable
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 2eb5d1aad531a6ba822d74f1231859aec47c133b..c8135b0ec70cc2eb92e5a6fd9353a134fda6b7bf 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-19,6
+19,7
@@
struct merge_options {
int verbosity;
int diff_rename_limit;
int merge_rename_limit;
+ int rename_score;
int call_depth;
struct strbuf obuf;
struct string_list current_file_set;