diff lisp/image.el @ 85465:b9fe84d8ca5a

(smerge-auto-refine): New var. (smerge-next, smerge-prev): Use it. (smerge-batch-resolve): Ad-hoc trick for Arch's .rej files.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 20 Oct 2007 01:52:22 +0000
parents c27859b68484
children 107ccd98fa12 14c4a6aac623
line wrap: on
line diff