mergetools / gvimdiff2on commit Merge branch 'es/name-hash-no-trailing-slash-in-dirs' (d6a58b7)
   1. "$MERGE_TOOLS_DIR/vimdiff"