Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
mingw: accomodate t0060-path-utils for MSYS2
[gitweb.git]
/
builtin
/
merge-file.c
diff --git
a/builtin/merge-file.c
b/builtin/merge-file.c
index 50d0bc873bee47ea6d1ab3b8e303e0a779465825..55447053f2dde004ceffff9967b015b4a01c35d1 100644
(file)
--- 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;
}