Mercurial > emacs

view 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
line wrap: on
line source

ignore 14
catch 18
ignore 20
ignore 23
alias s step
alias n next
alias c cont
alias st status
alias r run
alias l list
alias f file
alias q quit
alias w where
alias d delete
alias p print