diff options
| author | Eric S. Raymond | 2014-08-13 04:05:45 -0400 |
|---|---|---|
| committer | Eric S. Raymond | 2014-08-13 04:05:45 -0400 |
| commit | 2cc441ecbf093d2d7e319f2359b80fd358589b0f (patch) | |
| tree | b12c3085c43277ebb92f5e92ee91d110527335e0 /lisp/ChangeLog | |
| parent | c1677234a35ac49ac1dd4276a19e90ac8e62b6e6 (diff) | |
| download | emacs-2cc441ecbf093d2d7e319f2359b80fd358589b0f.tar.gz emacs-2cc441ecbf093d2d7e319f2359b80fd358589b0f.zip | |
Integrate Rüdiger Sonderfeld's code for detecting conflicted files under git.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7bb7415bc9c..764d6d12c8a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2014-08-13 Eric S. Raymond <esr@thyrsus.com> | ||
| 2 | |||
| 3 | * vc/vc-git.el (vc-git-conflicted-files): Integrate Rüdiger | ||
| 4 | Sonderfeld's code for detecting conflicted files using a status | ||
| 5 | listing. Useful in itself and a step towards better smerge | ||
| 6 | support. | ||
| 7 | |||
| 1 | 2014-08-12 Stefan Monnier <monnier@iro.umontreal.ca> | 8 | 2014-08-12 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 9 | ||
| 3 | * mpc.el (mpc-reorder): Don't bother splitting the "active"s elements | 10 | * mpc.el (mpc-reorder): Don't bother splitting the "active"s elements |