Merge branch 'rs/pop-commit'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"