Code

Merge branch 'jk/diff-CBM' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:06 +0000 (11:39 -0700)
commit9d1ec144ab2189f2c245fbdb15c0e0fe2c425a41
treea04745e027683a0d38f5adf7a8ebdb40fc948a4f
parent389fee78b60e2e497a322f40a2c82aee33df462e
parent07cd7265274ba6aed2589e6b22eae7d413640037
Merge branch 'jk/diff-CBM' into next

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