mergetools / vimdiff3on commit Merge branch 'js/fsck-name-object' into maint (8e7b78a)
   1. "$MERGE_TOOLS_DIR/vimdiff"