diff lisp/ediff-merg.el @ 70617:af5bc6c80df2

ERC is now part of Emacs. Add Emacs Muse.
author Romain Francoise <romain@orebokech.com>
date Fri, 12 May 2006 16:01:47 +0000
parents 6169b51037af
children 402a04b0362f d1c5430c5bff
line wrap: on
line diff