Merge branch 'rs/status-code-clean-up'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"