This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch 3.7-dev
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from e4ea40ffe9 Merge branch '3.6-dev' into 3.7-dev
add d7c2a7913b TINKERPOP-3056 Fixed bug in mid-traversal mergeE for onMatch
add d9e34fb467 Merge branch 'TINKERPOP-3056' into 3.6-dev
add 9b46b6777d Merge branch '3.6-dev' into 3.7-dev
No new revisions were added by this update.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../process/traversal/step/map/MergeEdgeStep.java | 6 ++--
.../Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs | 2 ++
gremlin-go/driver/cucumber/gremlin.go | 2 ++
.../gremlin-javascript/test/cucumber/gremlin.js | 2 ++
gremlin-python/src/main/python/radish/gremlin.py | 2 ++
.../gremlin/test/features/map/MergeEdge.feature | 42 ++++++++++++++++++++++
7 files changed, 54 insertions(+), 3 deletions(-)