diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 764d6d12c8a..39ab7caf874 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,8 +1,13 @@ | |||
| 1 | 2014-08-13 Eric S. Raymond <esr@thyrsus.com> | 1 | 2014-08-13 Eric S. Raymond <esr@thyrsus.com> |
| 2 | 2 | ||
| 3 | * vc/vc-git.el (vc-git-conflicted-files): Integrate Rüdiger | 3 | * vc/vc.git.el: (vc-git-find-file-hook): New function. Adds |
| 4 | Sonderfeld's code for detecting conflicted files using a status | 4 | support for calling smerge on a conflicted file, and calling git |
| 5 | listing. Useful in itself and a step towards better smerge | 5 | add when there are no longer conflict markers in a saved file. |
| 6 | This is a completed version of Rüdiger Sonderfeld's proposal. | ||
| 7 | |||
| 8 | * vc/vc-git.el (vc-git-conflicted-files): New function. Integrate | ||
| 9 | Rüdiger Sonderfeld's code for detecting conflicted files using a | ||
| 10 | status listing. Useful in itself and a step towards better smerge | ||
| 6 | support. | 11 | support. |
| 7 | 12 | ||
| 8 | 2014-08-12 Stefan Monnier <monnier@iro.umontreal.ca> | 13 | 2014-08-12 Stefan Monnier <monnier@iro.umontreal.ca> |