diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-08-17 11:41:25 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:03 -0700 |
| commit | 8e01251694fa277df53e5c52c137f0b4134d2cd5 (patch) | |
| tree | 83841c6049011be15ce34aed8f0fb7564725f9dc /builtin | |
| parent | merge-recursive: provide a better label for diff3 common ancestor (diff) | |
| download | tgif-8e01251694fa277df53e5c52c137f0b4134d2cd5.tar.xz | |
merge-recursive: introduce an enum for detect_directory_renames values
Improve code readability by introducing an enum to replace the
not-quite-boolean values taken on by detect_directory_renames.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/am.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 1aea657a7f..037e828efe 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1538,7 +1538,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa o.branch1 = "HEAD"; their_tree_name = xstrfmt("%.*s", linelen(state->msg), state->msg); o.branch2 = their_tree_name; - o.detect_directory_renames = 0; + o.detect_directory_renames = MERGE_DIRECTORY_RENAMES_NONE; if (state->quiet) o.verbosity = 0; |