# [PATCH] Documentation/technical/api-diff.txt: correct name of diff_unmerge() 1 messages from 2011-05-26 to 2011-05-26. Participants: Brandon Casey. Thread: https://gitlist.dev/t/27473 ## Brandon Casey, 2011-05-26 20:46 Subject: [PATCH] Documentation/technical/api-diff.txt: correct name of diff_unmerge() Message-ID: <1OYUkoTZ9lnzCtR8b7JelpPejr-QfrYvT8fEnZLPLk-TdnsgvRcAtTw7sncEtReLmIdxE8dB2ikYxpOO4ViEhQ@cipher.nrlssc.navy.mil> URL: https://gitlist.dev/e/1OYUkoTZ9lnzCtR8b7JelpPejr-QfrYvT8fEnZLPLk-TdnsgvRcAtTw7sncEtReLmIdxE8dB2ikYxpOO4ViEhQ%40cipher.nrlssc.navy.mil ``` From: Brandon Casey Signed-off-by: Brandon Casey --- Documentation/technical/api-diff.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 20b0241..2d2ebc0 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` -- 1.7.4.4 ```