mergetools / gvimdiff3on commit diff: --ignore-cr-at-eol (e9282f0)
   1. "$MERGE_TOOLS_DIR/vimdiff"