projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
new-command.txt: correct the command description file
[git]
/
builtin
/
merge-file.c
diff --git
a/builtin/merge-file.c
b/builtin/merge-file.c
index
50d0bc8
..
5544705
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;
}