Andrew's git / gitweb.git / diff
?
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)
* jc/hide-cr-in-diff-from-less:
diff: Help "less" hide ^M from the output

1  2 
combine-diff.c patch | diff1 | diff2 | blob | history
diff.c patch | diff1 | diff2 | blob | history
diff --cc combine-diff.c
Simple merge
diff --cc diff.c
Simple merge