Mercurial > emacs
view leim/.arch-inventory @ 93983:955774916817
(smerge-apply-resolution-patch): Fix typo.
(smerge-resolve): Merge the "2-way refinement" case with one half of
the "mere whitespace" resolution.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 11 Apr 2008 01:10:43 +0000 |
parents | a0fc4f10d0cf |
children |
line wrap: on
line source
# Auto-generated files, which ignore. precious ^(stamp-subdir|changed\..*|leim-list\.el)$ # arch-tag: a4cda8ae-2a52-4d85-bd29-14e25c7ed2a2