mergetools / vimdiff2on commit Merge branch 'mh/maint-lockfile-overflow' (fb58544)
   1. "$MERGE_TOOLS_DIR/vimdiff"