diff options
| author | Stefan Monnier | 2008-03-31 01:49:57 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-03-31 01:49:57 +0000 |
| commit | 2fa42bb70b23267d01347d1c471dc8a71e2c7026 (patch) | |
| tree | 37b971dc4704bb5c5c189f68ab27f920503979b4 /lisp/ChangeLog | |
| parent | 34ee3257bd6220b1635a66c7010293ff25e3cd4a (diff) | |
| download | emacs-2fa42bb70b23267d01347d1c471dc8a71e2c7026.tar.gz emacs-2fa42bb70b23267d01347d1c471dc8a71e2c7026.zip | |
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
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 0ca01a7c8f4..2c85b155cd4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-03-31 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * smerge-mode.el (smerge-refine): Allow highlighting other subparts | ||
| 4 | in 3-way conflicts. | ||
| 5 | |||
| 1 | 2008-03-31 Glenn Morris <rgm@gnu.org> | 6 | 2008-03-31 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for | 8 | * calendar/cal-bahai.el (calendar-bahai-date-string): Avoid an error for |