diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-03 15:32:41 -0800 |
| commit | 5c15ca0b3c866398f22cbab974d0a1964ef105ca (patch) | |
| tree | f7c7b00472862c2665c05bf522836b6401dc4e8e /Documentation | |
| parent | 3a27eec48ecfcc0764c90b3f478a124c01c082bc (diff) | |
| parent | e34f80278e920e53b69016c7cecb24e4621e4564 (diff) | |
| download | git-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.gz git-5c15ca0b3c866398f22cbab974d0a1964ef105ca.tar.xz | |
Merge branch 'jk/merge-file-exit-code' into maint
"git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.
* jk/merge-file-exit-code:
merge-file: clamp exit code to maximum 127
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge-file.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index d2fc12ec7..f85603261 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -41,7 +41,8 @@ lines from `<other-file>`, or lines from both respectively. The length of the conflict markers can be given with the `--marker-size` option. The exit value of this program is negative on error, and the number of -conflicts otherwise. If the merge was clean, the exit value is 0. +conflicts otherwise (truncated to 127 if there are more than that many +conflicts). If the merge was clean, the exit value is 0. 'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it implements all of RCS 'merge''s functionality which is needed by |