Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Fix Windows-specific macro redefinition warning.
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index f79917cef4fe429ded36bd3465f23336db4cd4a2..34492dbd6ea22d715c98acbeeabe04033ff9a794 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-14,6
+14,7
@@
struct merge_options {
} recursive_variant;
const char *subtree_shift;
unsigned buffer_output : 1;
+ unsigned renormalize : 1;
int verbosity;
int diff_rename_limit;
int merge_rename_limit;