emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117702: lisp/ChangeLog: Fix a recent log entry.


From: Eli Zaretskii
Subject: [Emacs-diffs] trunk r117702: lisp/ChangeLog: Fix a recent log entry.
Date: Wed, 13 Aug 2014 18:10:21 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117702
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-13 21:10:15 +0300
message:
  lisp/ChangeLog: Fix a recent log entry.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-08-13 14:16:48 +0000
+++ b/lisp/ChangeLog    2014-08-13 18:10:15 +0000
@@ -8,12 +8,11 @@
 
 2014-08-13  Eric S. Raymond  <address@hidden>
 
-       * 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]