Mercurial > emacs
view .cvsignore @ 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 | 661046481c02 |
| children | 787b888abdea |
line wrap: on
line source
bin boot.log boot.log.diff boot.log.old update.log config.log config.status config.cache Makefile emacs*.tar.gz leim*.tar.gz lock *.xdelta autom4te.cache site-lisp data