[Emacs-diffs] master updated (581914e -> b34578d)

[Stefan Monnier]

monnier pushed a change to branch master.

      from  581914e   newsticker: Prevent multiple "Could not download..." 
messages.  Fixes bug#19166.
       new  8dac9c3   * lisp/vc/diff-mode.el (diff-kill-applied-hunks): New 
command. * lisp/vc/smerge-mode.el (smerge-swap): New command.
       new  b34578d   * lisp/vc: Fix use of find-conflicted-file in Git.


Summary of changes:
 lisp/ChangeLog         |   19 +++++++++++++++----
 lisp/vc/diff-mode.el   |   10 ++++++++++
 lisp/vc/smerge-mode.el |   13 +++++++++++++
 lisp/vc/vc-git.el      |    2 +-
 lisp/vc/vc.el          |    3 ++-
 5 files changed, 41 insertions(+), 6 deletions(-)