mergetools / vimdiff3on commit Merge branch 'jk/checkout-from-tree' into maint (447c39a)
   1. "$MERGE_TOOLS_DIR/vimdiff"