Merge branch 'ft/diff-rename-default-score-is-half' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:05 +0000 (10:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2013 17:43:05 +0000 (10:43 -0700)
* ft/diff-rename-default-score-is-half:
  diff-options: document default similarity index

1  2 
Documentation/diff-options.txt

Simple merge