From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 May 2011 07:03:52 +0000 (-0700)
Subject: Merge branch 'bc/maint-api-doc-parked' into maint
X-Git-Tag: v1.7.5.4~16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2;p=git.git

Merge branch 'bc/maint-api-doc-parked' into maint

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

bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2