From: Glenn Morris Date: Wed, 20 Aug 2014 20:07:00 +0000 (-0400) Subject: ChangeLog fix X-Git-Tag: emacs-25.0.90~2635^2~679^2~453 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8dc52a1a455bf3f7779abccddc5bef8af2415b10;p=emacs.git ChangeLog fix Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e1033b1ab8d..115497c7e41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -75,14 +75,15 @@ 2014-08-13 Eric S. Raymond + * vc/vc.git.el (vc-git-resolve-when-done): New function. + Call "git add" when there are no longer conflict markers. + +2014-08-13 Rüdiger Sonderfeld + * vc/vc.git.el (vc-git-find-file-hook): New function. - Adds support for calling smerge on a conflicted file, and calling - "git add" when there are no longer conflict markers in a saved file. - This is a completed version of Rüdiger Sonderfeld's proposal. + Adds support for calling smerge (and resolve) on a conflicted file. (vc-git-conflicted-files): New function. - Integrate Rüdiger Sonderfeld's code for detecting conflicted files - using a status listing. Useful in itself and a step towards better - smerge support. + Useful in itself and a step towards better smerge support. 2014-08-12 Stefan Monnier