projects / civicrm-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 239ed37) | patch
CRM-18517 add merge test for when conflict encountered
authoreileen <emcnaughton@wikimedia.org>
Fri, 13 May 2016 04:26:23 +0000 (16:26 +1200)
committereileen <emcnaughton@wikimedia.org>
Mon, 16 May 2016 22:59:26 +0000 (10:59 +1200)
commita45614cc68477ee10182db87cab5596ac3514189
tree7deda3c00cfac228654ed8534e8fe050e1c2980ctree | snapshot (zip tar.gz)
parent239ed37700eaed162276de7ac392a0a9f9756d7acommit | diff
CRM-18517 add merge test for when conflict encountered

This test relies on the code loop being fixed
CRM/Core/BAO/PrevNextCache.php diff | blob | blame | history
tests/phpunit/api/v3/JobTest.php diff | blob | blame | history