diff --git a/builtin-rerere.c b/builtin-rerere.c
index 004eda2acdf9b8ac5a66f9717d2244613b23768e..b463c07f04b127ee3d1e17962813367fb4a5a588 100644 (file)
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
SHA1_Init(&ctx);
while (fgets(buf, sizeof(buf), f)) {
- if (!strncmp("<<<<<<< ", buf, 8))
+ if (!prefixcmp(buf, "<<<<<<< "))
hunk = 1;
- else if (!strncmp("=======", buf, 7))
+ else if (!prefixcmp(buf, "======="))
hunk = 2;
- else if (!strncmp(">>>>>>> ", buf, 8)) {
+ else if (!prefixcmp(buf, ">>>>>>> ")) {
hunk_no++;
hunk = 0;
if (memcmp(one->ptr, two->ptr, one->nr < two->nr ?