Mercurial > emacs
diff lisp/gs.el @ 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 | 73661ddc7ac7 |
children | 606f2d163a64 1e3a407766b9 |