Merge branch 'bc/maint-api-doc-parked' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 07:03:52 +0000 (00:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 May 2011 07:03:52 +0000 (00:03 -0700)
* bc/maint-api-doc-parked:
Documentation/technical/api-diff.txt: correct name of diff_unmerge()

Trivial merge