Mercurial > emacs
comparison lisp/eshell/em-basic.el @ 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 | 107ccd98fa12 |
| children | 606f2d163a64 1e3a407766b9 |
comparison
equal
deleted
inserted
replaced
| 87766:3aaff51200f9 | 87767:90318261ac4d |
|---|