[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117718: ChangeLog fix
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r117718: ChangeLog fix |
Date: |
Wed, 20 Aug 2014 20:07:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117718
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-20 16:07:00 -0400
message:
ChangeLog fix
Ref: http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01038.html
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-08-20 15:33:10 +0000
+++ b/lisp/ChangeLog 2014-08-20 20:07:00 +0000
@@ -75,14 +75,15 @@
2014-08-13 Eric S. Raymond <address@hidden>
+ * 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 <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.
- 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 <address@hidden>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117718: ChangeLog fix,
Glenn Morris <=