Mercurial > emacs

annotate etc/FTP @ 93983:955774916817

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
77214
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
1 For information about how to obtain GNU Emacs and other GNU software
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
2 by FTP, please see <http://www.gnu.org/order/ftp.html>.
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
3
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
4 Information about Emacs is also available at
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
5 <http://www.gnu.org/software/emacs/>.
e06541128138 Make it a duplicate of ../FTP.
Glenn Morris <rgm@gnu.org>
parents: 75861
diff changeset
6