summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2013-04-11 22:36:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-12 20:38:40 (GMT)
commit41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d (patch)
tree645135f6c34c03a1b409488bfa528536398228b5 /xdiff
parent2fec81cbe5a9867bac65bb0aa9e2605a9de68c4d (diff)
downloadgit-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.zip
git-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.gz
git-41ccfdd9c931ee71b09f38f4eb19cf44a8e4381d.tar.bz2
Correct common spelling mistakes in comments and tests
Most of these were found using Lucas De Marchi's codespell tool. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xdiffi.c2
-rw-r--r--xdiff/xhistogram.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 1b7012a..b2eb6db 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -490,7 +490,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
/*
* Try to move back the possibly merged group of changes, to match
- * the recorded postion in the other file.
+ * the recorded position in the other file.
*/
while (ixref < ix) {
rchg[--ixs] = 1;
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index bf99787..73210cb 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -55,7 +55,7 @@ struct histindex {
struct record {
unsigned int ptr, cnt;
struct record *next;
- } **records, /* an ocurrence */
+ } **records, /* an occurrence */
**line_map; /* map of line to record chain */
chastore_t rcha;
unsigned int *next_ptrs;