X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=xdiff%2Fxmerge.c;h=9e13b25abc90350de4488276074dc282edc216b1;hb=b3f01ff29f7131e959bcfdfd004744d74d5fa319;hp=6d6fc1bc5e01be7305ec5101f43645a1dce69bd3;hpb=e1ba0f6340c1d72677c7792a0a82ecf05363026e;p=git.git diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c index 6d6fc1bc5..9e13b25ab 100644 --- a/xdiff/xmerge.c +++ b/xdiff/xmerge.c @@ -336,7 +336,7 @@ static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m, static int line_contains_alnum(const char *ptr, long size) { while (size--) - if (isalnum(*(ptr++))) + if (isalnum((unsigned char)*(ptr++))) return 1; return 0; }