Merge branch 'rs/commit-m-no-edit'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"