mergetools / gvimdiffon commit Merge branch 'jc/ignore-cr-at-eol' (10f65c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"