diff options
| author | Brandon Casey <drafnel@gmail.com> | 2011-05-26 20:46:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 21:50:24 (GMT) |
| commit | 7a45c313964e293f45384ca0a2ae1d326c83a061 (patch) | |
| tree | affcc5c082d5b7c9b2d802e418317f4831c473d2 /Documentation/technical | |
| parent | 09ffc706e48f93ed622a9a61704b2f767666b30d (diff) | |
| download | git-7a45c313964e293f45384ca0a2ae1d326c83a061.zip git-7a45c313964e293f45384ca0a2ae1d326c83a061.tar.gz git-7a45c313964e293f45384ca0a2ae1d326c83a061.tar.bz2 | |
Documentation/technical/api-diff.txt: correct name of diff_unmerge()
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | 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` |