Merge branch 'rr/diffcore-pickaxe-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (3 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (3 15:41 -0700)
* rr/diffcore-pickaxe-doc:
  diffcore-pickaxe doc: document -S and -G properly
  diffcore-pickaxe: make error messages more consistent

1  2 
Documentation/diff-options.txt

Simple merge