Mercurial > emacs
view doc/misc/.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 | 1a1bf5f79f55 |
| children |
line wrap: on
line source
*.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log *.op *.ops *.pdf *.pg *.pgs *.ps *.tmp *.toc *.tp *.tps *.vr *.vrs Makefile makefile