diff options
| author | Eli Zaretskii | 2014-08-13 21:10:15 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-08-13 21:10:15 +0300 |
| commit | 995be0785eb3e6a2e12b3dc2a39f1b192649bc80 (patch) | |
| tree | 5a71b9e0c3853a784b54231005dd539619a2c6d3 | |
| parent | de34d6b400788060be8f24e183c6d33a12587b3a (diff) | |
| download | emacs-995be0785eb3e6a2e12b3dc2a39f1b192649bc80.tar.gz emacs-995be0785eb3e6a2e12b3dc2a39f1b192649bc80.zip | |
lisp/ChangeLog: Fix a recent log entry.
| -rw-r--r-- | lisp/ChangeLog | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 14146a032bf..41dbe0e91b9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -8,12 +8,11 @@ | |||
| 8 | 8 | ||
| 9 | 2014-08-13 Eric S. Raymond <esr@thyrsus.com> | 9 | 2014-08-13 Eric S. Raymond <esr@thyrsus.com> |
| 10 | 10 | ||
| 11 | * vc/vc.git.el: (vc-git-find-file-hook): New function. | 11 | * vc/vc.git.el (vc-git-find-file-hook): New function. |
| 12 | Adds support for calling smerge on a conflicted file, and calling git | 12 | Adds support for calling smerge on a conflicted file, and calling |
| 13 | add when there are no longer conflict markers in a saved file. | 13 | "git add" when there are no longer conflict markers in a saved file. |
| 14 | This is a completed version of Rüdiger Sonderfeld's proposal. | 14 | This is a completed version of Rüdiger Sonderfeld's proposal. |
| 15 | 15 | (vc-git-conflicted-files): New function. | |
| 16 | * vc/vc-git.el (vc-git-conflicted-files): New function. | ||
| 17 | Integrate Rüdiger Sonderfeld's code for detecting conflicted files | 16 | Integrate Rüdiger Sonderfeld's code for detecting conflicted files |
| 18 | using a status listing. Useful in itself and a step towards better | 17 | using a status listing. Useful in itself and a step towards better |
| 19 | smerge support. | 18 | smerge support. |