Merge branch 'jk/diff-CBM'
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:11 +0000 (11:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 19:24:11 +0000 (11:24 -0800)
commitf04aa35eb6117d99f5abf9630961b2c2651d3ed1
tree80039e4c8aa5f45100f8a8fb48a75acf0fef78a6
parenta48aafd31b19cd7b2d1812dc5d207acb50781dfc
parent07cd7265274ba6aed2589e6b22eae7d413640037
Merge branch 'jk/diff-CBM'

* jk/diff-CBM:
  diff: report bogus input to -C/-M/-B
diff.c