Merge branch 'jc/merge-x-theirs-docfix' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"