Merge branch 'ev/pull-already-up-to-date-is-noop' into maint
[alt-git.git] / mergetools / nvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"