Merge branch 'jc/sequencer-stopped-sha-simplify'
[git] / mergetools / nvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"