Merge branch 'js/fetch-multi-lockfix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"