Mercurial > emacs
diff msdos/ChangeLog @ 93442:a6d8268a0da6
(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 | 9e0765860b01 |
children | fa41f74280f5 |