[nongnu] elpa/magit updated (8771401 -> 3e415b7)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

      from  8771401   Fix gravatar image size
      adds  3e415b7   Support invoking smerge from magit buffers

No new revisions were added by this update.

Summary of changes:
 Documentation/magit.org  | 15 +++++++++--
 Documentation/magit.texi | 15 +++++++++--
 lisp/magit-apply.el      | 65 ++++++++++++++++++++++++++++++++++++++++++++++--
 lisp/magit-diff.el       | 10 +++++++-
 4 files changed, 98 insertions(+), 7 deletions(-)