This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch feat/show-git-hash-in-info
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from c8b0b0a report git sha on welcome request
add 45a0ad9 Add `conflicts: true` option to mango selectors
add 572234f Add tests for mango conflict finding
new e1bb5e8 Merge branch 'master' into feat/show-git-hash-in-info
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/mango/src/mango_cursor_view.erl | 8 ++++----
src/mango/test/19-find-conflicts.py | 41 +++++++++++++++++++++++++++++++++++++
src/mango/test/mango.py | 5 +++++
3 files changed, 50 insertions(+), 4 deletions(-)
create mode 100644 src/mango/test/19-find-conflicts.py
