diff lisp/ediff-merg.el @ 11746:e93b5c05c949

(main): Increase lock timeout to five minutes.
author Richard M. Stallman <rms@gnu.org>
date Sun, 07 May 1995 22:36:27 +0000
parents 4d2a2fe1d8d7
children 87f8b79217b3
line wrap: on
line diff