diff options
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 ced6be1f9f..d88307489b 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 |