Merge branch 'js/default-branch-name-part-2'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"