![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 May 2011 07:03:52 +0000 (00:03 -0700) | ||
| committer | Junio 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()
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
Trivial merge