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

1  2 
Documentation/diff-options.txt
Simple merge