diff options
| author | Adam Kocoloski <kocolosk@apache.org> | 2011-01-31 02:46:44 +0000 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2012-11-14 15:41:46 +0000 |
| commit | 574be32dc59813a94134726c158cf1bc24b81038 (patch) | |
| tree | 79fce245f9e6f0f177e834b1b076fb392bf7e53c /.gitignore | |
| parent | d9ad14be41bc341ba507d629ef0bde5139cd8029 (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.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1065471 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions