Mercurial > emacs
view src/.cvsignore @ 47780:27caec378c23
(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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 07 Oct 2002 16:24:42 +0000 |
| parents | bdf5794b5e20 |
| children | 41bc433c6843 d7ddb3e565de |
line wrap: on
line source
*.core Makefile Makefile.c TAGS-LISP bootstrap-emacs config.h config.stamp emacs emacs-* epaths.h obj prefix-args stamp-oldxmenu temacs _gdbinit gdb.ini *-spd *.pdb