Mercurial > emacs

view .arch-inventory @ 65129:8303172e4c68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(smerge-remove-props): Make the args non-optional. (smerge-keep-n): Remove props. (smerge-keep-base, smerge-keep-other, smerge-keep-mine) (smerge-keep-current, smerge-kill-current): Don't remove props anymore now that it's done in smerge-keep-n. (smerge-refined-change): New face. (smerge-refine-chopup-region, smerge-refine-highlight-change) (smerge-refine): New funs. (smerge-basic-map): Bind smerge-refine.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Thu, 25 Aug 2005 20:13:38 +0000
parents 7cb1d5f71446
children
line wrap: on
line source

# Generated files
precious ^(config\.status|config\.cache)$

# Install-in-place makes these directories, so just ignore them
backup ^(bin|data|lock|site-lisp)$

# arch-tag: 6eeeaa4e-cc7e-4b22-b3d7-1089e155da14