projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 039d7c8) | patch
[REF] extract getConflicts function
authoreileen <emcnaughton@wikimedia.org>
Sat, 27 Apr 2019 06:36:12 +0000 (18:36 +1200)
committereileen <emcnaughton@wikimedia.org>
Sun, 28 Apr 2019 21:16:02 +0000 (09:16 +1200)
commita2abc387f600a4d3eb34a3414fab85d2aa3b89a5
tree9d9f4b61f49cc68696db25e4e0c39110355982b7tree | snapshot (zip tar.gz)
parent039d7c802009e719682bd7e4404aac125ba48d87commit | diff
[REF] extract getConflicts function

This is for readability but I also want to add an api that retrieves conflicts without
trying a merge for more control
CRM/Dedupe/Merger.php diff | blob | blame | history