diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-01-17 14:23:24 -0500 |
| commit | 4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch) | |
| tree | 6a637dd4dde653f870346a37ec6555eb0574949a /ext/fts2/fts2.c | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'ext/fts2/fts2.c')
| -rw-r--r-- | ext/fts2/fts2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/fts2/fts2.c b/ext/fts2/fts2.c index 74c2890..93e03cd 100644 --- a/ext/fts2/fts2.c +++ b/ext/fts2/fts2.c @@ -5051,7 +5051,7 @@ static int leavesReaderAtEnd(LeavesReader *pReader){ ** modification to control flow all over the place, though, so for now ** just punt. ** -** Note the the current system assumes that segment merges will run to +** Note the current system assumes that segment merges will run to ** completion, which is why this particular probably hasn't arisen in ** this case. Probably a brittle assumption. */ |