mergetools / gvimdiff3on commit Merge branch 'js/pack-objects-mutex-init-fix' into maint (e3c18aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"