Commit 5e2cf2ca2c639b142776709df83b7fcbae0e4a70

Jacques Germishuys 2014-10-10T13:22:11

Ensure filters (i.e. CRLF) are applied when checking out conflict content