[TYPO3-core] Merge binary file when cherry picking

[Fabien Udriot]

Hi,

Working on: https://review.typo3.org/#change,958

I tried cherry-picking the patch with suggested command:

git fetch git://git.typo3.org/TYPO3v4/Core refs/changes/58/958/2 && git cherry-pick FETCH_HEAD

I run into a problem when applying the patch as I got the following error:

warning: Cannot merge binary files: typo3/sysext/t3skin/images/sprites/t3skin.png

I did a very quick search but didn't manage to solve the problem with this link:
http://stackoverflow.com/questions/278081/resolving-a-git-conflict-with-binary-files

Any clue round here?

Fabien