annotate lisp/net/.cvsignore @ 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 a313aa06c3bd
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
29750
a313aa06c3bd ignore *.elc
Sam Steingold <sds@gnu.org>
parents:
diff changeset
1 *.elc