Merge branch 'js/t4015-wo-master'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"