Mercurial > emacs

comparison lisp/ChangeLog @ 87767:90318261ac4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 15 Jan 2008 21:40:09 +0000
parents 3aaff51200f9
children 2dfbe4c86ab7
comparison
equal deleted inserted replaced
87766:3aaff51200f9 87767:90318261ac4d
1 2008-01-15 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * smerge-mode.el (smerge-refine): Also work on "same change conflicts".
4 (smerge-makeup-conflict): New command.
5
1 2008-01-15 Thien-Thi Nguyen <ttn@gnuvola.org> 6 2008-01-15 Thien-Thi Nguyen <ttn@gnuvola.org>
2 7
3 * log-edit.el (log-edit): Doc fix. 8 * log-edit.el (log-edit): Doc fix.
4 9
5 2008-01-15 Glenn Morris <rgm@gnu.org> 10 2008-01-15 Glenn Morris <rgm@gnu.org>