diff options
| author | Noah Slater <nslater@apache.org> | 2009-07-06 00:33:50 +0000 |
|---|---|---|
| committer | Noah Slater <nslater@apache.org> | 2009-07-06 00:33:50 +0000 |
| commit | 282b96ddd9a84b740788c2358ec0f5fedafb7cc6 (patch) | |
| tree | fb48e605ceb8079d0195d3b1ec0eca7110fa7ef2 /test/etap/060-kt-merging.t | |
| parent | b5cc085d3bc6316063f14adedf20632ee904875d (diff) | |
trimmed trailing whitespace
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@791350 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/etap/060-kt-merging.t')
| -rwxr-xr-x | test/etap/060-kt-merging.t | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/etap/060-kt-merging.t b/test/etap/060-kt-merging.t index 004e004f..f5d9fbe7 100755 --- a/test/etap/060-kt-merging.t +++ b/test/etap/060-kt-merging.t @@ -28,7 +28,7 @@ test() -> Stemmed1a = [{1, {"1a", "bar", [{"1aa", "bar", []}]}}], Stemmed1aa = [{2, {"1aa", "bar", []}}], Stemmed1bb = [{2, {"1bb", "boo", []}}], - + etap:is( {EmptyTree, no_conflicts}, couch_key_tree:merge(EmptyTree, EmptyTree), @@ -69,7 +69,7 @@ test() -> {TwoChildSibs, no_conflicts}, couch_key_tree:merge(TwoChildSibs, TwoChildSibs), "Merging a tree to itself is itself."), - + etap:is( {TwoChildSibs, no_conflicts}, couch_key_tree:merge(TwoChildSibs, Stemmed1b), @@ -87,7 +87,7 @@ test() -> couch_key_tree:merge(TwoChildSibs2, Stemmed1bb), "Merging a stem at a deeper level." ), - + etap:is( {TwoChildSibs2, no_conflicts}, couch_key_tree:merge(Stemmed1bb, TwoChildSibs2), @@ -118,11 +118,11 @@ test() -> couch_key_tree:merge(OneChild, Stemmed1aa), "Merging should create conflicts." ), - + etap:is( {TwoChild, no_conflicts}, couch_key_tree:merge(Expect1, TwoChild), "Merge should have no conflicts." ), - + ok. |