summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
Diffstat (limited to 'builtin/merge-file.c')
-rw-r--r--builtin/merge-file.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge-file.c b/builtin/merge-file.c
index 50d0bc873b..55447053f2 100644
--- a/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@ -104,5 +104,8 @@ int cmd_merge_file(int argc, const char **argv, const char *prefix)
free(result.ptr);
}
+ if (ret > 127)
+ ret = 127;
+
return ret;
}