Merge branch 'hb/git-pm-tempfile'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"