| commit | 2fa42bb70b23267d01347d1c471dc8a71e2c7026 | |
| author | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 31 Mar 2008 01:49:57 +0000 (31 01:49 +0000) | ||
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | |
| Mon, 31 Mar 2008 01:49:57 +0000 (31 01:49 +0000) | ||
| tree | 37b971dc4704bb5c5c189f68ab27f920503979b4 | treesnapshot (tar.gz zip) |
| parent | 34ee3257bd6220b1635a66c7010293ff25e3cd4a | commitdiff |
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
| lisp/ChangeLog | diffblobblamehistory | |
| lisp/smerge-mode.el | diffblobblamehistory |