{"thread":{"id":"27473","subject":"[PATCH] Documentation/technical/api-diff.txt: correct name of diff_unmerge()","startedAt":"2011-05-26T20:46:56Z","lastAt":"2011-05-26T20:46:56Z","messageCount":1,"participants":["Brandon Casey"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"168820","messageId":"1OYUkoTZ9lnzCtR8b7JelpPejr-QfrYvT8fEnZLPLk-TdnsgvRcAtTw7sncEtReLmIdxE8dB2ikYxpOO4ViEhQ@cipher.nrlssc.navy.mil","threadId":"27473","inReplyTo":null,"subject":"[PATCH] Documentation/technical/api-diff.txt: correct name of diff_unmerge()","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2011-05-26T20:46:56Z","receivedAt":"2011-05-26T20:46:56Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey <drafnel@gmail.com>\n\n\nSigned-off-by: Brandon Casey <casey@nrlssc.navy.mil>\n---\n Documentation/technical/api-diff.txt |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt\nindex 20b0241..2d2ebc0 100644\n--- a/Documentation/technical/api-diff.txt\n+++ b/Documentation/technical/api-diff.txt\n@@ -32,7 +32,7 @@ Calling sequence\n \n * As you find different pairs of files, call `diff_change()` to feed\n   modified files, `diff_addremove()` to feed created or deleted files,\n-  or `diff_unmerged()` to feed a file whose state is 'unmerged' to the\n+  or `diff_unmerge()` to feed a file whose state is 'unmerged' to the\n   API.  These are thin wrappers to a lower-level `diff_queue()` function\n   that is flexible enough to record any of these kinds of changes.\n \n@@ -50,7 +50,7 @@ Data structures\n This is the internal representation for a single file (blob).  It\n records the blob object name (if known -- for a work tree file it\n typically is a NUL SHA-1), filemode and pathname.  This is what the\n-`diff_addremove()`, `diff_change()` and `diff_unmerged()` synthesize and\n+`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and\n feed `diff_queue()` function with.\n \n * `struct diff_filepair`\n-- \n1.7.4.4\n"}]}