Merge branch 'es/checkout-index-temp'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"