mergetools / vimdiff3on commit Merge branch 'km/test-mailinfo-b-failure' into maint (6f0c89d)
   1. "$MERGE_TOOLS_DIR/vimdiff"