mergetools / gvimdiff2on commit Merge branch 'ds/fetch-disable-force-notice' (cde9a64)
   1. "$MERGE_TOOLS_DIR/vimdiff"