Merge branch 'mh/maint-lockfile-overflow' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"