]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a27eec e34f802)
Merge branch 'jk/merge-file-exit-code' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:41 +0000 (15:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Nov 2015 23:32:41 +0000 (15:32 -0800)
commit5c15ca0b3c866398f22cbab974d0a1964ef105ca
treef7c7b00472862c2665c05bf522836b6401dc4e8etree | snapshot
parent3a27eec48ecfcc0764c90b3f478a124c01c082bccommit | diff
parente34f80278e920e53b69016c7cecb24e4621e4564commit | diff
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
builtin/merge-file.c diff1 | diff2 | blob | history
t/t7600-merge.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.