view FTP @ 78572:5b92bb6e6570

(smerge-resolve): New arg `safe'. (smerge-resolve-all, smerge-batch-resolve): New function. (smerge-refine): Make sure `diff' returns the expected result. (smerge-parsep-re): New const. (smerge-mode): Use it to adjust paragraph-separate.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 16 Aug 2007 20:04:36 +0000
parents 5e1b6a63ac46
children
line wrap: on
line source

For information about how to obtain GNU Emacs and other GNU software
by FTP, please see <http://www.gnu.org/order/ftp.html>.

Information about Emacs is also available at
<http://www.gnu.org/software/emacs/>.