view etc/FTP @ 93983:955774916817

(smerge-apply-resolution-patch): Fix typo. (smerge-resolve): Merge the "2-way refinement" case with one half of the "mere whitespace" resolution.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 11 Apr 2008 01:10:43 +0000
parents e06541128138
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/>.