Merge branch 'sg/commit-cleanup-scissors'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"