diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-30 14:57:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 14:57:54 -0700 |
| commit | 448d13221622c70044962cac25e117c342dea9bb (patch) | |
| tree | 352665d68a735bf45d4d12f300548f480e3270e7 /git-merge-file.txt | |
| parent | ee615806f274b21a580f4f3d4380973fdcae6efa (diff) | |
| download | git-htmldocs-448d13221622c70044962cac25e117c342dea9bb.tar.gz | |
Autogenerated HTML docs for v2.6.2-402-g2635c2b
Diffstat (limited to 'git-merge-file.txt')
| -rw-r--r-- | git-merge-file.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-file.txt b/git-merge-file.txt index d2fc12ec7..f85603261 100644 --- a/git-merge-file.txt +++ b/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 |