Mercurial > emacs
view src/.dbxinit @ 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 | 18e524802887 |
children |
line wrap: on
line source
ignore 14 catch 18 ignore 20 ignore 23 alias s step alias n next alias c cont alias st status alias r run alias l list alias f file alias q quit alias w where alias d delete alias p print