mergetools / gvimdiffon commit Merge branch 'cw/diff-highlight' (18cfb74)
   1. "$MERGE_TOOLS_DIR/vimdiff"