combine-diff: replace malloc/snprintf with xstrfmt