Merge branch 'ak/pre-receive-hook-template-modefix'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"