Merge branch 'js/avoid-split-sideband-message'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"