projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd4c91f) | patch
Add resolved to return array for get_conflicts
authoreileen <emcnaughton@wikimedia.org>
Tue, 12 Nov 2019 01:23:28 +0000 (14:23 +1300)
committereileen <emcnaughton@wikimedia.org>
Thu, 21 Nov 2019 03:43:52 +0000 (16:43 +1300)
commit403400d940e94dcb5cec6031e35ec1d2d5e83e95
tree3d10e7d3dbd5d006d8a1936eacbbc0d4751c463ctree | snapshot (zip tar.gz)
parentbd4c91fa63ea1884bcb352aa2a27952f2a0862dfcommit | diff
Add resolved to return array for get_conflicts

The goal here is to be able to display what the script will do if a force mode merge is done. The
expection of this is the reason why the 'conflicts' has a key - to allow 'resolved' to schmooze in next to it
in a non-breaking way.

I haven't added in locations yet as I want to move code around before I do that or the spaghetti will
be breeding
CRM/Dedupe/Merger.php diff | blob | blame | history
api/v3/Contact.php diff | blob | blame | history
tests/phpunit/api/v3/ContactTest.php diff | blob | blame | history
tests/phpunit/api/v3/JobTestCustomDataTest.php diff | blob | blame | history