diff lisp/register.el @ 47756:b2c9ea334a34

(smerge-ediff): Add name-{mine,other,base} args.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 04 Oct 2002 15:25:22 +0000
parents 0e418919d79e
children c623c9adbefe
line wrap: on
line diff