Mercurial > emacs

view etc/ORDERS @ 66687:26faad662ac6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2005-11-04 Michael Kifer <kifer@cs.stonybrook.edu> * ediff-merge.el (ediff-merge-region-is-non-clash): return t, if not merging. * ediff-util.el (ediff-previous-difference): don't skip regions that have merge clashes.
author Michael Kifer <kifer@cs.stonybrook.edu>
date Fri, 04 Nov 2005 05:40:03 +0000
parents 4ba215bc5b2d
children 3681678d3d86
line wrap: on
line source

Printed copies of the GNU Emacs Manual, the Emacs Lisp Reference
Manual, "Programming in Emacs Lisp: An Introduction", and other
materials can be ordered directly from the Free Software Foundation.
For more information, see the order form on the web at
<http://www.gnu.org/order/order.html>.  Your purchases will help support
further development of Emacs and other free software programs.  You
can also make tax-deductable donations to the Free Software Foundation,
a not-for-profit organization (assuming you pay US taxes) - see
<http://www.gnu.org/help/donate.html>.