Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-help.txt: document "git help cmd" vs "git cmd --help" for aliases
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 0c46a5a4ff48340efac6c4fd6399855067313c3b..e6a0828ecacd81d820feb8caa07c90707e97f8b4 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-20,6
+20,7
@@
struct merge_options {
unsigned renormalize : 1;
long xdl_opts;
int verbosity;
+ int detect_directory_renames;
int diff_detect_rename;
int merge_detect_rename;
int diff_rename_limit;