(vc-cvs-parse-entry): Make sure a file with conflicts
[bpt/emacs.git] / lisp / ediff-diff.el
2003-02-04 Juanma BarranqueroTrailing whitespace deleted.
2002-11-17 Michael Kifer2002-11-17 Michael Kifer <kifer@cs.stonybrook.edu>
2002-07-03 Juanma BarranqueroFix typo.
2002-03-20 Michael Kifer* ediff-diff.el (ediff-install-fine-diff-if-necessary...
2002-01-08 Michael Kifer2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
2001-12-11 Richard M. Stallman(ediff-cmp-options): Doc fix.
2001-12-09 Stefan MonnierDoc fix.
2001-07-21 Michael Kifer* viper-ex.el (ex-token-list,ex-cmd-execute): Revamped...
2001-07-16 Pavel JaníkSome fixes to follow coding conventions.
2001-03-17 Michael Kifer2001-03-17 Michael Kifer <kifer@cs.sunysb.edu>
2001-02-12 Michael Kifer2001-02-12 Michael Kifer <kifer@cs.sunysb.edu>
2000-11-24 Michael Kifer* ediff-diff.el: Moved variables around to have it...
2000-07-06 Michael Kifer2000-07-05 Michael Kifer <kifer@cs.sunysb.edu>
2000-06-05 Michael Kifer2000-06-05 Michael Kifer <kifer@cs.sunysb.edu>
2000-05-25 Michael Kifer2000-05-25 Michael Kifer <kifer@cs.sunysb.edu>
2000-05-24 Michael Kifer2000-05-24 Michael Kifer <kifer@cs.sunysb.edu>
1999-11-25 Michael Kifer*** empty log message ***
1999-11-01 Michael Kifer*** empty log message ***
1999-06-22 Karl HeuerComment fix.
1998-05-04 Michael Kifernew version
1998-03-14 Richard M. Stallman(ediff-exec-process): store-match-data => set-match...
1997-11-25 Michael Kifernew version
1997-11-01 Michael Kifernew version
1997-09-06 Michael Kifernew version
1997-07-31 Michael Kifernew version
1997-05-31 Michael Kifernew version
1996-09-20 Michael Kifer*** empty log message ***
1996-06-22 Michael Kifer*** empty log message ***
1996-06-22 Michael Kifer*** empty log message ***
1996-05-06 Richard M. Stallman(ediff-setup-fine-diff-regions):
1996-02-16 Michael Kifer*** empty log message ***
1996-01-14 Erik NaggumUpdate FSF's address.
1996-01-04 Karl Heuer(ediff-exec-process): Fix local var misspelling.
1995-10-14 Michael KiferMoved defsubsts up.
1995-10-06 Michael Kifer(ediff-setup-diff-regions,ediff-setup-diff-regions3,
1995-06-05 Karl HeuerChanged window-system to ediff-window-display.
1995-04-07 Karl HeuerUpdate copyright.
1995-03-16 Karl HeuerInitial revision