comparison lisp/chistory.el @ 47781:79bdd88fb006

(vc-resolve-conflicts); Typo.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 07 Oct 2002 16:50:43 +0000
parents 829beb9a6a4b
children d414c281a629
comparison
equal deleted inserted replaced
47780:27caec378c23 47781:79bdd88fb006