mergetools / vimdiff3on commit Merge branch 'es/checkout-index-temp' (c00e1c5)
   1. "$MERGE_TOOLS_DIR/vimdiff"