[nongnu] elpa/magit updated (efe590bb4f -> f9a15cb349)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

      from  efe590bb4f Move face utilities to magit-section
      adds  f9a15cb349 magit-discard-files: Account for 'renamed on both sides' 
conflicts

No new revisions were added by this update.

Summary of changes:
 docs/RelNotes/3.4.0.org | 3 +++
 lisp/magit-apply.el     | 3 ++-
 lisp/magit-merge.el     | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)