Merge branch 'jk/fix-alias-pager-config-key-warnings' into maint
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"