Merge branch 'js/fsmonitor-refresh-after-discarding-index'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"