diff src/lisp.h @ 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 35d2f0abc597
children 4f5a9f3d91ae 1251cabc40b7
line wrap: on
line diff