Mercurial > emacs

annotate src/vlimit.h @ 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 695cf19ef79e
children 375f2633d815
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Dummy for Emacs so that we can run on VMS... */
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2 #define LIM_DATA 0
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 484
diff changeset
3
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 484
diff changeset
4 /* arch-tag: 0c3436cb-5edc-447a-87af-acec402a65b9
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 484
diff changeset
5 (do not change this comment) */