summaryrefslogtreecommitdiff
path: root/test/etap/060-kt-merging.t
AgeCommit message (Expand)Author
2010-12-29Stem revision trees after merging a path, COUCHDB-968Adam Kocoloski
2010-12-29Skip recursive path merging, COUCHDB-968Adam Kocoloski
2010-12-08Change key_tree merge to take path as 2nd arg, add type specsAdam Kocoloski
2010-12-08Prefer values from old tree when merging, COUCHDB-968Adam Kocoloski
2009-11-09Fixes 'make distcheck' to run the test suite.Paul Joseph Davis
2009-09-29Add ETap to CouchDB's SVN repository.Paul Joseph Davis
2009-07-14added licence check, and licence.skipNoah Slater
2009-07-06trimmed trailing whitespaceNoah Slater
2009-06-24Lots of tests for couch_config.erlPaul Joseph Davis
2009-06-11Forgot to set the plan size.Paul Joseph Davis
2009-06-11Integrating more ETAP tests from Bob Dionne.Paul Joseph Davis