Mercurial > emacs

view lib-src/.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 056555472800
children 655e2c8d2f5f
line wrap: on
line source

# Ignore binaries
backup ^(test-distrib|make-docfile|profile|digest-doc|movemail|cvtmail|fakemail|yow|emacsserver|hexl|update-game-score|etags|ctags|emacsclient|b2m|ebrowse|sorted-doc)$

# Building actually makes a copy/link of the source file
precious ^(ctags\.c)$

# Windows generates this
backup ^(DOC)$

# arch-tag: da33b3d6-170d-4fe5-9eb8-ed2753bc9b4f