magit/magit — pull request #1178 by schouleu (2014-01-30 09:52:56+00:00)
Title: Add support for cherry-pick conflicts operations

When a cherry-pick fails, git is waiting for you to resolve the
conflicts and then to --abort or to --continue the cherry-pick.

This state is now shown by magit-status with proposed actions.