Merge branch 'jc/warn-pathless-add-finishing-touches'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"