Merge branch 'jc/check-attr-honor-working-tree' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"