diff lisp/ediff-merg.el @ 86075:a7a49982b6d9

New file.
author Jay Belanger <jay.p.belanger@gmail.com>
date Thu, 15 Nov 2007 02:57:08 +0000
parents 9355f9b7bbff
children 73661ddc7ac7 d755c1fce9b3 f55f9811f5d7
line wrap: on
line diff