diff options
| author | Dan Nicolaescu | 2010-01-06 07:11:52 -0800 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-01-06 07:11:52 -0800 |
| commit | 7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e (patch) | |
| tree | c2d13de50f38649dc6552e237621b48e181aae97 /lisp/ChangeLog | |
| parent | 8a9082249c14f2cdac3d534502c3f66cc8804195 (diff) | |
| download | emacs-7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e.tar.gz emacs-7534fa5ed2ebbab8efee55bbacf0ba57f754ff6e.zip | |
(vc-bzr-after-dir-status): Ignore pending merges.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2827ff8d9d5..a5569604bd8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-01-06 Dan Nicolaescu <dann@ics.uci.edu> | ||
| 2 | |||
| 3 | * vc-bzr.el (vc-bzr-after-dir-status): Ignore pending merges. | ||
| 4 | |||
| 1 | 2010-01-05 Tom Tromey <tromey@redhat.com> | 5 | 2010-01-05 Tom Tromey <tromey@redhat.com> |
| 2 | 6 | ||
| 3 | * progmodes/python.el (python-font-lock-keywords): Handle | 7 | * progmodes/python.el (python-font-lock-keywords): Handle |