OSDN Git Service

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)
* jc/maint-hide-cr-in-diff-from-less:
  diff: Help "less" hide ^M from the output

1  2 
diff.c

diff --cc diff.c
Simple merge