Mercurial > emacs

view info/.gitignore @ 108952:7ffdaf7a645c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve merge conflict, giving preference to the emacs-23 version of the code.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 09 Jun 2010 21:10:04 -0400
parents 214450de83bc
children ef719132ddfa
line wrap: on
line source

*

# arch-tag: 4cf702c2-f50e-49bd-a3ff-4fd962c5975a