diff lispintro/cons-2.eps @ 54586:c3043c1faed3

(vc-maybe-resolve-conflicts): Don't prompt the user.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 26 Mar 2004 16:17:12 +0000
parents a8ee89e61d20
children 6ad2412f0362
line wrap: on
line diff