Mercurial > emacs

annotate src/.dbxinit @ 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 18e524802887
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25843
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
1 ignore 14
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
2 catch 18
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
3 ignore 20
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
4 ignore 23
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
5 alias s step
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
6 alias n next
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
7 alias c cont
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
8 alias st status
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
9 alias r run
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
10 alias l list
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
11 alias f file
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
12 alias q quit
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
13 alias w where
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
14 alias d delete
18e524802887 #ecrt0.c
Dave Love <fx@gnu.org>
parents:
diff changeset
15 alias p print