Merge branch 'pa/cherry-pick-doc-typo'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"