Mercurial > emacs

view etc/ORDERS @ 65129:8303172e4c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Aug 2005 20:13:38 +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>.