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>
Brandon Casey committed
May 26, 2011 at 13:46 UTC
7a45c313964e293f45384ca0a2ae1d326c83a061
1 file changed
+2
-2
Documentation/technical/api-diff.txt
+2
-2
@@ -32,7 +32,7 @@ Calling sequence
32
33
* As you find different pairs of files, call `diff_change()` to feed
34
modified files, `diff_addremove()` to feed created or deleted files,
35
- or `diff_unmerged()` to feed a file whose state is 'unmerged' to the
35
+ or `diff_unmerge()` to feed a file whose state is 'unmerged' to the
36
API. These are thin wrappers to a lower-level `diff_queue()` function
37
that is flexible enough to record any of these kinds of changes.
38
@@ -50,7 +50,7 @@ Data structures
50
This is the internal representation for a single file (blob). It
51
records the blob object name (if known -- for a work tree file it
52
typically is a NUL SHA-1), filemode and pathname. This is what the
53
-`diff_addremove()`, `diff_change()` and `diff_unmerged()` synthesize and
53
+`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and
54
feed `diff_queue()` function with.
55
56
* `struct diff_filepair`