Merge branch 'sg/t7800-difftool-robustify'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"