civicrm/civicrm-core — pull request #1778 by ravishnair (2013-10-10 10:53:30+00:00)
Title: -- CRM-13557 suppressed invalid fields during manual merge

----------------------------------------
* CRM-13557: Contact Hash is appearing on manual merge screen and should be suppressed
http://issues.civicrm.org/jira/browse/CRM-13557

The regression was introduced after this commit https://github.com/civicrm/civicrm-core/commit/16254ae1 a part of PR https://github.com/civicrm/civicrm-core/pull/537 in which the validFields array was removed and getContactFields() function was created which returns the fields obtained from CRM_Contact_DAO_Contact::fields(). So, this function lists all Contact fields except for the "id" field which is unset within the function. So, hash and some other invalid fields which was not part of the validField array also gets displayed during manual merge. I have suppressed those fields in this PR.