Merge branch 'jc/add-u-A-default-to-top' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"