]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8748595) | patch
(vc-maybe-resolve-conflicts): Always call vc-resolve-conflicts
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 7 Oct 2002 16:24:42 +0000 (16:24 +0000)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 7 Oct 2002 16:24:42 +0000 (16:24 +0000)
commitedc37d121445a203270a64da3ab2203bf2f0cb91
tree85830ea885d1823c41adcf78b8493355cf877d55tree | snapshot
parent8748595969efc939ff0645323717d0e0279c54d4commit | diff
(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.
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.