Mercurial > emacs
view lisp/eshell/.arch-inventory @ 87767:90318261ac4d
(smerge-refine): Also work on "same change conflicts".
(smerge-makeup-conflict): New command.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 15 Jan 2008 21:40:09 +0000 |
parents | a0fc4f10d0cf |
children |
line wrap: on
line source
# Generated files precious ^(esh-groups)\.el$ # arch-tag: 8dc7bfaa-6ca6-4be0-915a-1e539c3dabfb