![[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) | ||
| commit | bcb477fb60dc3e7c75a0c2870b106afeb21ae5d2 | |
| tree | f766e0c08f08560d53336a2ee8fa469d9f877c70 | tree | snapshot |
| parent | 144dfc5c63dfe829aafdb2cba3bd549600b6008b | commit | diff |
| parent | 7a45c313964e293f45384ca0a2ae1d326c83a061 | commit | diff |
Merge branch 'bc/maint-api-doc-parked' into maint
* bc/maint-api-doc-parked:
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
* bc/maint-api-doc-parked:
Documentation/technical/api-diff.txt: correct name of diff_unmerge()