From 15a793bb04e87feda1567c25c361cf270209f77a Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 17 May 2016 20:22:59 +1200 Subject: [PATCH] Update comments --- CRM/Dedupe/Merger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 83c6a6c57f..e1b5e1c6d8 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -583,8 +583,8 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m * Group id. * @param string $mode * Helps decide how to behave when there are conflicts. - * A 'safe' value skips the merge if there are any un-resolved conflicts. - * Does a force merge otherwise. + * A 'safe' value skips the merge if there are any un-resolved conflicts, wheras 'aggressive' + * mode does a force merge. * @param bool $autoFlip to let api decide which contact to retain and which to delete. * Whether to let api decide which contact to retain and which to delete. * @param int $batchLimit number of merges to carry out in one batch. -- 2.25.1