mergetools / vimdiff2on commit Merge branch 'jk/check-corrupt-objects-carefully' (a6fed65)
   1. "$MERGE_TOOLS_DIR/vimdiff"