Mercurial > emacs
view etc/celibacy.1 @ 66687:26faad662ac6
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 | 03ddf0b96330 |
children |
line wrap: on
line source
CELIBACY(1) UNIX Programmer's Manual CELIBACY(1) NAME celibacy - don't have sex SYNOPSIS celibacy DESCRIPTION Does nothing worth mentioning.