diff lisp/diff.el @ 46515:272c43ada087

Remove conflict marker.
author Andreas Schwab <schwab@suse.de>
date Thu, 18 Jul 2002 09:42:56 +0000
parents 6b7dcaa53b5c
children bac8aaf18835
line wrap: on
line diff