Merge branch 'rr/diffcore-pickaxe-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (15:41 -0700)
commit4efd165...3fe1c0871742dbd33d6adc2acfd11c3c
tree322061a...94a0b48657d617e47c3b2705381dac31copy hash to clipboard (tree)
parent213d256...8ae926d523727f1df06ad7ee4d4ad916copy hash to clipboard (diff)
parent5bc3f0b...6779d189aaf7cab7e5d307aa4e7c0887copy hash to clipboard (diff)
Documentation/diff-options.txt