# HG changeset patch
# User Michael Kifer <kifer@cs.stonybrook.edu>
# Date 812942406 0
# Node ID a880e9199b575d23568d61423e4c48bd29466267
# Parent  0e069b2940aef4cd198587cd25766d952256fd32
Added (load "ediff-hook") after loading vc-hook.

diff -r 0e069b2940ae -r a880e9199b57 lisp/loadup.el
--- a/lisp/loadup.el	Fri Oct 06 01:01:08 1995 +0000
+++ b/lisp/loadup.el	Fri Oct 06 01:20:06 1995 +0000
@@ -130,6 +130,7 @@
 
 (garbage-collect)
 (load "vc-hooks")
+(load "ediff-hook")
 
 ;If you want additional libraries to be preloaded and their
 ;doc strings kept in the DOC file rather than in core,