Merge branch 'rs/fmt-merge-msg-string-leak-fix'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"