Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Sep 2008 09:14:18 +0000 (02:14 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Sep 2008 09:14:18 +0000 (02:14 -0700)
commit26c10c7ad39357bd94129c3949fed67c39302b0f
tree88ffbda22c14a4fd3778623ee31afeb09915e71f
parent94c27881bd98d5bb70e3d4f8a18e384095c876b9
parent392809702016cde59d50a7b07e8c27f6d0ec3c3f
Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maint

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