[Emacs-diffs] master updated (b05702d -> 2ede38c)

[Stefan Monnier]

monnier pushed a change to branch master.

      from  b05702d   Increase timeout on emba for Tramp
       new  2eecaa2   * lisp/vc/smerge-mode.el (smerge-vc-next-conflict): New 
command
       new  2ede38c   * lisp/vc/smerge-mode.el (smerge-change-buffer-confirm): 
New var


Summary of changes:
 lisp/vc/smerge-mode.el | 34 ++++++++++++++++++++++++++++++++++
 lisp/vc/vc-hooks.el    | 20 ++++++++++----------
 lisp/vc/vc.el          | 45 ++++++++++++++++-----------------------------
 3 files changed, 60 insertions(+), 39 deletions(-)