civicrm/civicrm-core — pull request #787 by eileenmcnaughton (2013-05-17 20:05:16+00:00)
Title: Whitespacelimited

I dropped the commits that no longer apply cleanly (since this was a few days old. I think the number of lines fixed drops by about 500)

https://github.com/eileenmcnaughton/civicrm-core/commit/dea7d07a02b8b25a2f96e19afd49f55f35dd0894

CONFLICT (content): Merge conflict in CRM/Contribute/Form/ContributionPage/Amount.php

https://github.com/eileenmcnaughton/civicrm-core/commit/a6ef57ef814cf682b61fccff589419b08344892a

Applying: CRM-12595 fix formatting in templates files (M)
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging templates/CRM/Member/Form/MembershipRenewal.tpl
CONFLICT (content): Merge conflict in templates/CRM/Member/Form/MembershipRenew
l.tpl
Auto-merging templates/CRM/Member/Form/Membership.tpl
Failed to merge in the changes.
Patch failed at 0010 CRM-12595 fix formatting in templates files (M)