mergetools / gvimdiffon commit apply: file commited with CRLF should roundtrip diff and apply (c24f3ab)
   1. "$MERGE_TOOLS_DIR/vimdiff"