Commit 13de93631664cd6eec3afedabb7145d5562a3e01

Jacques Germishuys 2015-03-12T12:36:09

Collapse whitespace flags into git_merge_file_flags_t