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 /test/journal1.test | |
| parent | 9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff) | |
| parent | 1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff) | |
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1
Conflicts:
.gitignore
Diffstat (limited to 'test/journal1.test')
| -rw-r--r-- | test/journal1.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/journal1.test b/test/journal1.test index 2fdadfd..c89dd2b 100644 --- a/test/journal1.test +++ b/test/journal1.test @@ -41,7 +41,7 @@ do_test journal1-1.1 { } 8 # Make changes to the database and save the journal file. -# Then delete the database. Replace the the journal file +# Then delete the database. Replace the journal file # and try to create a new database with the same name. The # old journal should not attempt to rollback into the new # database. |