pub fn resolve_file_executable(merge: &Merge<Option<bool>>) -> Option<bool>
Resolves conflicts in file executable bit, returns the original state if the file is deleted and executable bit is unchanged.