Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
l10n: fr.po: Correct case in sentence
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index 9e090a347016ea715acf8d26ec5527f033b94ba1..52f0201f68a30114345cbfcc8b3d6204174facfd 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-17,6
+17,7
@@
struct merge_options {
unsigned renormalize : 1;
long xdl_opts;
int verbosity;
+ int detect_rename;
int diff_rename_limit;
int merge_rename_limit;
int rename_score;