[Emacs-diffs] [emacs] 02/02: Resolve pull conflict

[Stefan Monnier]

monnier pushed a commit to branch master
in repository emacs.

commit 1a713024a012f574d16084cf42703e6ef49473cf
Merge: 9075fcc d409545
Author: Stefan Monnier <address@hidden>
Date:   Sun Nov 16 00:23:39 2014 -0500

    Resolve pull conflict

 lisp/ChangeLog      |   12 ++++++++
 lisp/vc/vc-hooks.el |   72 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 0 deletions(-)

diff --cc lisp/ChangeLog
index 42de048,cfb7900..2fabb8e
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,26 -1,18 +1,38 @@@
 +2014-11-16  Andreas Schwab  <address@hidden>
 +
 +      * version.el (emacs-repository-get-version): Use git rev-parse
 +      instead of git log.
 +
 +2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
 +
 +      * progmodes/python.el (python-indent-calculate-levels):
 +      Fix indentation behavior multiline dedenter statement.  (Bug#18432)
 +
 +2014-11-16  Fabián Ezequiel Gallina  <address@hidden>
 +
 +      * progmodes/python.el (python-indent-region):
 +      Use python-indent-line and skip special cases.  (Bug#18843)
 +
 +2014-11-16  Peder O. Klingenberg  <address@hidden>  (tiny change)
 +
 +      * mail/emacsbug.el (report-emacs-bug): Make a better guess at
 +        envelope-from when reporting through sendmail (bug#19054).
 +
+ 2014-11-16  Oscar Fuentes <address@hidden>
+ 
+       Add faces for the VC modeline state indicator.
+       * lisp/vc/vc-hooks.el:
+       (vc-state-faces, vc-state-base-face)
+       (vc-up-to-date-state, vc-needs-update-state)
+       (vc-locked-state, vc-locally-added-state)
+       (vc-conflict-state, vc-removed-state)
+       (vc-missing-state, vc-edited-state):
+       New faces.
+       (vc-default-mode-line-string): Use them
+ 
  2014-11-16  Stefan Monnier  <address@hidden>
  
 -      * emacs-lisp/backquote.el (backquote-process): Optimize away the ,' 
case.
 +      * emacs-lisp/backquote.el (backquote-process): Optimize away ",'".
  
  2014-11-15  Lars Magne Ingebrigtsen  <address@hidden>