From: Eli Zaretskii Date: Wed, 13 Aug 2014 18:10:15 +0000 (+0300) Subject: lisp/ChangeLog: Fix a recent log entry. X-Git-Tag: emacs-25.0.90~2635^2~679^2~469 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=995be0785eb3e6a2e12b3dc2a39f1b192649bc80;p=emacs.git lisp/ChangeLog: Fix a recent log entry. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14146a032bf..41dbe0e91b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,12 +8,11 @@ 2014-08-13 Eric S. Raymond - * 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. + * 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. - - * vc/vc-git.el (vc-git-conflicted-files): New function. + (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.