Files
git/Documentation
Junio C Hamano 5c15ca0b3c 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
2015-11-03 15:32:41 -08:00
..
2015-10-16 14:40:05 -07:00
2015-05-11 14:39:28 -07:00
2014-11-04 13:14:44 -08:00
2014-11-04 13:14:44 -08:00
2015-07-21 14:08:14 -07:00
2013-10-18 13:50:12 -07:00
2015-10-16 14:40:05 -07:00
2015-01-22 13:44:14 -08:00