summaryrefslogtreecommitdiff
path: root/delta.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-04-08 19:00:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-04-08 19:00:28 (GMT)
commitd59c12d7ad39f942fc60578ba1e934822f40445b (patch)
treef0591d6490164e7a8a672c79094a2d612899cfb7 /delta.h
parent9b30a0339db28e6de9653b5631247d398cce626c (diff)
parent235e8d591480d7e1378c27fe65c5529625d4b5be (diff)
downloadgit-d59c12d7ad39f942fc60578ba1e934822f40445b.zip
git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.gz
git-d59c12d7ad39f942fc60578ba1e934822f40445b.tar.bz2
Merge branch 'jl/nor-or-nand-and'
Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"
Diffstat (limited to 'delta.h')
-rw-r--r--delta.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/delta.h b/delta.h
index b9d333d..9b67531 100644
--- a/delta.h
+++ b/delta.h
@@ -9,7 +9,7 @@ struct delta_index;
*
* This returns a pointer to a struct delta_index that should be passed to
* subsequent create_delta() calls, or to free_delta_index(). A NULL pointer
- * is returned on failure. The given buffer must not be freed nor altered
+ * is returned on failure. The given buffer must not be freed or altered
* before free_delta_index() is called. The returned pointer must be freed
* using free_delta_index().
*/