diff lisp/smerge-mode.el @ 74125:abd25d5e5b63

(Antinews): Mention --server-file and TCP sockets.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 22 Nov 2006 17:13:41 +0000
parents 2b77fa42947f
children e3694f1cb928 d9f8d2a65d18 2ecafc6d5db7
line wrap: on
line diff