Mercurial > emacs

comparison lisp/ChangeLog @ 93442:a6d8268a0da6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 31 Mar 2008 01:49:57 +0000
parents c13d8b4cc7ad
children 3a3281d7f1dd
comparison
equal deleted inserted replaced
93441:c13d8b4cc7ad 93442:a6d8268a0da6
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
4 pre-Bahai dates. 9 pre-Bahai dates.
5 10