Commit caaa1fdf8b7233736e9d6f5ae040eb4d8071e5b8
2022-02-07T00:58:38
merge: change enum GIT_MERGE_FILE_FAVOR__CONFLICTED to flag GIT_MERGE_FILE__CONFLICTED This is to avoid a possible problem where the value is set to the same as GIT_MERGE_FILE_SIMPLIFY_ALNUM in git_merge_file_flag_t