From: Brandon Casey Date: Thu, 26 May 2011 20:46:56 +0000 (-0700) Subject: Documentation/technical/api-diff.txt: correct name of diff_unmerge() X-Git-Tag: v1.7.5.4~16^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7a45c313964e293f45384ca0a2ae1d326c83a061;p=git.git Documentation/technical/api-diff.txt: correct name of diff_unmerge() Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano --- diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 20b0241d3..2d2ebc04b 100644 --- a/Documentation/technical/api-diff.txt +++ b/Documentation/technical/api-diff.txt @@ -32,7 +32,7 @@ Calling sequence * As you find different pairs of files, call `diff_change()` to feed modified files, `diff_addremove()` to feed created or deleted files, - or `diff_unmerged()` to feed a file whose state is 'unmerged' to the + or `diff_unmerge()` to feed a file whose state is 'unmerged' to the API. These are thin wrappers to a lower-level `diff_queue()` function that is flexible enough to record any of these kinds of changes. @@ -50,7 +50,7 @@ Data structures This is the internal representation for a single file (blob). It records the blob object name (if known -- for a work tree file it typically is a NUL SHA-1), filemode and pathname. This is what the -`diff_addremove()`, `diff_change()` and `diff_unmerged()` synthesize and +`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and feed `diff_queue()` function with. * `struct diff_filepair`