Mercurial > emacs
diff lisp/ediff-merg.el @ 12349:f5ba89f88cfd
Talk about MSDOS type conflict workaround.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 21 Jun 1995 18:57:25 +0000 |
parents | 87f8b79217b3 |
children | 9d432c26c3a7 |
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Wed, 21 Jun 1995 18:57:25 +0000 |
parents | 87f8b79217b3 |
children | 9d432c26c3a7 |