Merge branch 'js/fsck-name-object'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"