diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-29 00:00:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-29 00:00:09 -0800 |
| commit | 25c4f61c51a91051dcba3b8bbbac4c61aa69cc19 (patch) | |
| tree | 3c5dfb372ebed51da95d0a096143c63e6c277a26 /Documentation/technical | |
| parent | 42be5cc61202014d4f1df61f9791067191f9393d (diff) | |
| parent | 9907721501e19758e64bcce6d3b140316c9307b9 (diff) | |
| download | git-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.tar.gz git-25c4f61c51a91051dcba3b8bbbac4c61aa69cc19.tar.xz | |
Merge branch 'maint'
* maint:
templates/Makefile: don't depend on local umask setting
Correct name of diff_flush() in API documentation
Start preparing for 1.5.4.4
Conflicts:
RelNotes
Diffstat (limited to 'Documentation/technical')
| -rw-r--r-- | Documentation/technical/api-diff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt index 83b007e70..20b0241d3 100644 --- a/Documentation/technical/api-diff.txt +++ b/Documentation/technical/api-diff.txt @@ -39,7 +39,7 @@ Calling sequence * Once you finish feeding the pairs of files, call `diffcore_std()`. This will tell the diffcore library to go ahead and do its work. -* Calling `diffcore_flush()` will produce the output. +* Calling `diff_flush()` will produce the output. Data structures |