Merge branch 'jp/index-with-corrupt-stages'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"