Mercurial > emacs

view lisp/.arch-inventory @ 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 a0fc4f10d0cf
children 18f95be962c1
line wrap: on
line source

# Auto-generated lisp files, which ignore
precious ^(loaddefs|finder-inf|cus-load)\.el$

# Something generated during a windows build?!?
precious ^(Makefile\.unix)$

# arch-tag: fc62dc9f-3a91-455b-b8e7-d49df66beee0