Merge branch 'js/trace2-to-directory'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"