diff options
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96f210a2ba8..09a5d256464 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-02-01 Dan Nicolaescu <dann@ics.uci.edu> + + * vc-bzr.el (vc-bzr-dir-extra-headers): Add a header when a + pending merge is detected. + 2010-01-31 Juri Linkov <juri@jurta.org> * progmodes/grep.el (zrgrep): Call `grep-compute-defaults' at the |