Merge branch 'jc/hide-cr-in-diff-from-less'
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Sep 2008 06:45:40 +0000 (23:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Sep 2008 06:45:40 +0000 (23:45 -0700)
commitfdfb4cfadcfdfe4ebafd0545b5ebb661433ea66c
tree6aa57e5f061a32801c706496357f020556cff200
parent11bd3ddb913afd9665e7e822ea54be4fc8d2d5ea
parent392809702016cde59d50a7b07e8c27f6d0ec3c3f
Merge branch 'jc/hide-cr-in-diff-from-less'

* jc/hide-cr-in-diff-from-less:
  diff: Help "less" hide ^M from the output
combine-diff.c
diff.c