Tue, 04 Feb 2003 12:29:42 +0000 |
Juanma Barranquero |
Trailing whitespace deleted.
|
Thu, 10 Oct 2002 17:30:20 +0000 |
Stefan Monnier |
(smerge-ediff): Autoload.
|
Thu, 10 Oct 2002 13:01:14 +0000 |
Stefan Monnier |
(smerge-ediff): Autoload.
|
Fri, 04 Oct 2002 15:25:22 +0000 |
Stefan Monnier |
(smerge-ediff): Add name-{mine,other,base} args.
|
Tue, 03 Sep 2002 01:20:20 +0000 |
Stefan Monnier |
(smerge-diff-buffer-name): Default to *vc-diff*.
|
Thu, 15 Aug 2002 00:48:20 +0000 |
Stefan Monnier |
Use find-file-hook instead of find-file-hooks.
|
Thu, 15 Nov 2001 01:25:35 +0000 |
Stefan Monnier |
(smerge-match-conflict): Fix typo.
|