I'm tired of waiting for the JIRA maintenance window to end so I'm just going to comment here. I've combined pieces of Bob Dionne's various patches from this ticket and COUCHDB-988 into a single commit here:
https://github.com/kocolosk/couchdb/commit/1efd87 It focuses on the merge code/tests/docs. The actual change to the merge code is small and has been discussed before; I only replaced "or" with "orelse". The rest of the commit involves reorganizing and augmenting the tests and providing a version of Paul's description of the key tree as the module @doc. I think it's high time we get this into trunk. Best, Adam
