mergetools / gvimdiff2on commit Merge branch 'tb/char-may-be-unsigned' into maint (85eb0f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"