diff options
| author | Elijah Newren <newren@gmail.com> | 2018-08-29 10:06:12 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-30 17:58:59 +0300 |
| commit | 5fdddd9b757a50c9a583936e7e6e44ec96d2d651 (patch) | |
| tree | ccfdb42370b3238335013c190cfd58154bc4c95e /merge-recursive.h | |
| parent | e7588c96526293055727b27c4c51df86cfe06daf (diff) | |
merge-recursive: add ability to turn off directory rename detection
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
| -rw-r--r-- | merge-recursive.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.h b/merge-recursive.h index fa7bc6b683..e39ee5d78b 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -18,6 +18,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; |