Merge branch 'ab/doc-hash-brokenness'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"