mergetools / gvimdiff2on commit Merge branch 'rj/mingw-compat-st-mode-bits' (00480a1)
   1. "$MERGE_TOOLS_DIR/vimdiff"