Mercurial > emacs
comparison leim/CXTERM-DIC/QJ-b5.tit @ 87767:90318261ac4d
(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 | 04f23eb0c0ca |
| children | 07774e5c3ff5 f1196eda45a0 ef719132ddfa |
comparison
equal
deleted
inserted
replaced
| 87766:3aaff51200f9 | 87767:90318261ac4d |
|---|