Review Request: Load merge message saved by git if available

[Sergey Vidyuk]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/102858/
-----------------------------------------------------------

Review request for KDevelop.


Description
-------

Load message saved by git in case of conflicts during merge, rebase or cherry-pick

Depends on the review request https://git.reviewboard.kde.org/r/102857/


Diffs
-----

  plugins/git/gitplugin.cpp 7040c7e 

Diff: http://git.reviewboard.kde.org/r/102858/diff/diff


Testing
-------

Manually tested


Thanks,

Sergey Vidyuk

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kdevelop-devel/attachments/20111014/ebfd5952/attachment.html>