diff options
| author | Robert Newson <rnewson@apache.org> | 2011-06-20 21:22:02 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2011-06-20 21:22:02 +0000 |
| commit | 0827cb483ef4cf74123313e8f2d0d2bd5ce8e46b (patch) | |
| tree | 0368430767ad613748d03dd29686722b4efdb0d1 /share/www/script/test/view_sandboxing.js | |
| parent | f0aaa2c3c7f6bbb858b40a55267781f1bcde0f67 (diff) | |
Fix spurious declarations of new merge conflicts
This patch also adds extra tests of the key tree merging logic as well
as edoc-formatted documentation for the module and a few of the merge
functions. Closes COUCHDB-902.
Thanks Paul Davis, Bob Dionne, Klaus Trainer.
backported from trunk@1065471
Conflicts:
src/couchdb/couch_key_tree.erl
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1137789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'share/www/script/test/view_sandboxing.js')
0 files changed, 0 insertions, 0 deletions