diff options
| author | Elijah Newren <newren@gmail.com> | 2020-12-03 15:59:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 22:38:40 (GMT) |
| commit | 1c7873cdf4a7e84755c54e3f9ef10599041565d0 (patch) | |
| tree | a2eaf50b15cf0677534ce7fc87523e440a93b77c /merge-ort.c | |
| parent | 101bc5bc2d73484d288a43fdcf1c00bc04b080e4 (diff) | |
| download | git-1c7873cdf4a7e84755c54e3f9ef10599041565d0.zip git-1c7873cdf4a7e84755c54e3f9ef10599041565d0.tar.gz git-1c7873cdf4a7e84755c54e3f9ef10599041565d0.tar.bz2 | |
merge-ort: add a path_conflict field to merge_options_internal
This field is not yet used, but will be used by both the rename handling
code, and the conflict type handling code in process_entry().
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/merge-ort.c b/merge-ort.c index ced6be1..d883074 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -166,6 +166,13 @@ struct conflict_info { unsigned df_conflict:1; /* + * Whether this path is/was involved in a non-content conflict other + * than a directory/file conflict (e.g. rename/rename, rename/delete, + * file location based on possible directory rename). + */ + unsigned path_conflict:1; + + /* * For filemask and dirmask, the ith bit corresponds to whether the * ith entry is a file (filemask) or a directory (dirmask). Thus, * filemask & dirmask is always zero, and filemask | dirmask is at |