Merge "Allow fields to define their own merge strategy via callback."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 9 Mar 2017 21:32:46 +0000 (21:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 9 Mar 2017 21:32:46 +0000 (21:32 +0000)
commite7e52af3e1f7bb26910442ac412a751e84c33ef1
tree1e4971c052af9846bd95a0add294cb1e9c1453d7
parentfc7a1666f1a2a7e9772262c71e316332a48a653a
parentcae86036aaa8929805bd158b4f269e999a87625c
Merge "Allow fields to define their own merge strategy via callback."