Mercurial > emacs
comparison src/s/usg5-4-2.h @ 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 | 7a9cd78d4b0e |
| children | 695cf19ef79e |
comparison
equal
deleted
inserted
replaced
| 47779:d53b71650f3b | 47780:27caec378c23 |
|---|