mergetools / gvimdiffon commit Merge branch 'tg/t0021-racefix' (8f3ba42)
   1. "$MERGE_TOOLS_DIR/vimdiff"