Mercurial > emacs
comparison oldXMenu/XMakeAssoc.c @ 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 | 77b2ab19bece |
| children | 648e6c714c7d 5cc91198ffb2 a63dbe9548aa |
comparison
equal
deleted
inserted
replaced
| 93441:c13d8b4cc7ad | 93442:a6d8268a0da6 |
|---|