diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 13:54:01 -0700 |
| commit | caa7d79f1f7c9940acfaf161b9b84bbf81980d95 (patch) | |
| tree | bbfbe6ac84575766b4752e48960d12288a8b6c42 /xdiff | |
| parent | e2af9e361b1d7452492baa073790b19292f9c038 (diff) | |
| parent | a46221e9adcf3deb88c4fc904859205bf87f784c (diff) | |
| download | git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.gz git-caa7d79f1f7c9940acfaf161b9b84bbf81980d95.tar.xz | |
Sync with 'maint'
* maint:
Correct common spelling mistakes in comments and tests
kwset: fix spelling in comments
precompose-utf8: fix spelling of "want" in error message
compat/nedmalloc: fix spelling in comments
compat/regex: fix spelling and grammar in comments
obstack: fix spelling of similar
contrib/subtree: fix spelling of accidentally
git-remote-mediawiki: spelling fixes
doc: various spelling fixes
fast-export: fix argument name in error messages
Documentation: distinguish between ref and offset deltas in pack-format
i18n: make the translation of -u advice in one go
Diffstat (limited to 'xdiff')
| -rw-r--r-- | xdiff/xdiffi.c | 2 | ||||
| -rw-r--r-- | xdiff/xhistogram.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 1b7012a11..b2eb6db2c 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 bf99787c3..73210cb6f 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; |