mergetools / gvimdiff2on commit Revert "submodules: fix ambiguous absolute paths under Windows" (0170a3c)
   1. "$MERGE_TOOLS_DIR/vimdiff"