couchdb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benoitc <...@git.apache.org>
Subject [GitHub] couchdb-couch-mrview pull request: Add view changes functionality
Date Mon, 08 Sep 2014 14:12:33 GMT
Github user benoitc commented on a diff in the pull request:

    https://github.com/apache/couchdb-couch-mrview/pull/2#discussion_r17239679
  
    --- Diff: test/04-index-info.t ---
    @@ -36,6 +46,18 @@ test() ->
         etap:is(getval(compact_running, Info), false, "No compaction running."),
         etap:is(getval(waiting_clients, Info), 0, "No waiting clients."),
     
    +<<<<<<< HEAD
    --- End diff --
    
    merge pb?


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

Mime
View raw message