mergetools / gvimdiff2on commit Merge branch 'mh/maint-lockfile-overflow' into maint (dbed593)
   1. "$MERGE_TOOLS_DIR/vimdiff"