/[emacs]/emacs/lisp/ediff-merg.el
ViewVC logotype

Diff of /emacs/lisp/ediff-merg.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.25 by lute, Mon Jul 4 23:08:53 2005 UTC revision 1.26 by ttn, Sat Aug 6 22:13:42 2005 UTC
# Line 1  Line 1 
1  ;;; ediff-merg.el --- merging utilities  ;;; ediff-merg.el --- merging utilities
2    
3  ;; Copyright (C) 1994, 95, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.  ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4    ;;   2003, 2004, 2005 Free Software Foundation, Inc.
5    
6  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>  ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7    

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26