diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-07 16:24:42 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-10-07 16:24:42 +0000 |
| commit | edc37d121445a203270a64da3ab2203bf2f0cb91 (patch) | |
| tree | 85830ea885d1823c41adcf78b8493355cf877d55 /lisp/emacs-lisp/lisp-mode.el | |
| parent | 8748595969efc939ff0645323717d0e0279c54d4 (diff) | |
| download | emacs-edc37d121445a203270a64da3ab2203bf2f0cb91.tar.gz emacs-edc37d121445a203270a64da3ab2203bf2f0cb91.tar.bz2 emacs-edc37d121445a203270a64da3ab2203bf2f0cb91.zip | |
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
in case some other package redefined it.
(vc-resolve-conflicts): Make it into an alias for smerge-ediff.
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions