diff make-dist @ 47781:79bdd88fb006

(vc-resolve-conflicts); Typo.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 07 Oct 2002 16:50:43 +0000
parents f526d32944b1
children 23a1cea22d13
line wrap: on
line diff