diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-01-15 21:40:09 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2008-01-15 21:40:09 +0000 |
| commit | 30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a (patch) | |
| tree | 72aab8063990bea84c0b215c61011b3f3a0c2831 /lisp/emacs-lisp | |
| parent | 2507310c84e569a0dcb981d497b8a067dfaffccd (diff) | |
| download | emacs-30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a.tar.gz emacs-30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a.tar.bz2 emacs-30e68410fec9e2d3f0d06c6b9e60a77b7feb4c2a.zip | |
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions