message: solving binary conflicts
diff: @@ -6,6 +6,7 @@ Bug fix and feature release
  * Add support for solving merge conflicts for whole files
  * Support rebasing with conflict solving
  * implement amending commits (author, committer, commit message, adding tree to commit)
  +* Solving binary conflicts
  #### Changed
  * Fix Segmentation fault when using space to stage files
  