[Emacs-diffs] [emacs] branch emacs-24 updated (1040099 -> d4fceca)

[Michael Albinus]

albinus pushed a change to branch emacs-24
in repository emacs.

      from  1040099   Mark last change as "tiny"
       new  260cede   Backport: Fixes: debbugs:18940
       new  d4fceca   Fix cherry-pick conflict.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 lisp/ChangeLog   |    4 ++++
 lisp/vc/vc-hg.el |   24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)