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)
commitbcb477fb60dc3e7c75a0c2870b106afeb21ae5d2
treef766e0c08f08560d53336a2ee8fa469d9f877c70
parent144dfc5c63dfe829aafdb2cba3bd549600b6008b
parent7a45c313964e293f45384ca0a2ae1d326c83a061
Merge branch 'bc/maint-api-doc-parked' into maint

* bc/maint-api-doc-parked:
  Documentation/technical/api-diff.txt: correct name of diff_unmerge()