delta/emacs.git - git.savannah.gnu.org: git/emacs.git

	Commit message (Expand)	Author	Age	Files	Lines
*	(smerge-mode): Add duplicate defvar near top.	Richard M. Stallman	2005-07-03	1	-0/+3
*	(smerge-ensure-match): Don't use `format' on `error' arguments.	Juanma Barranquero	2005-06-16	1	-1/+1
*	Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-375	Miles Bader	2005-06-10	1	-8/+16
*	* mh-customize.el (mh-speedbar-selected-folder-face): Special case	Dan Nicolaescu	2005-04-08	1	-2/+8
*	(smerge-mode): Specify :group.	Lute Kamstra	2005-04-04	1	-2/+2
*	(smerge-diff-switches): Fix typo in docstring.	Juanma Barranquero	2004-04-30	1	-3/+3
*	(smerge-match-conflict): Fix last change.	Stefan Monnier	2004-04-15	1	-1/+1
*	(smerge-match-conflict): Try to do something sensible	Stefan Monnier	2004-04-15	1	-4/+13
*	(smerge-popup-context-menu): Use it.	Stefan Monnier	2004-04-14	1	-2/+2
*	(smerge-mode-menu): Fix activate pred for resolve.	Stefan Monnier	2004-03-23	1	-47/+72
*	(smerge-popup-context-menu): Put `unwind-protect' arround `overlay-put' and `...	Masatake YAMATO	2004-03-16	1	-7/+9
*	2004-03-15 Masatake YAMATO <jet@gyve.org>	Masatake YAMATO	2004-03-15	1	-16/+94
*	(smerge-check-cache, smerge-check): New var and fun.	Stefan Monnier	2004-03-10	1	-15/+47
*	Previous change was bogus. Something odd in pcl-cvs...	Dave Love	2003-10-06	1	-4/+3
*	Comment.	Dave Love	2003-10-06	1	-3/+4
*	Add arch taglines	Miles Bader	2003-09-01	1	-1/+3
*	Trailing whitespace deleted.	Juanma Barranquero	2003-02-04	1	-7/+7
*	(smerge-ediff): Autoload.	Stefan Monnier	2002-10-10	1	-2/+18
*	(smerge-ediff): Autoload.	Stefan Monnier	2002-10-10	1	-1/+2
*	(smerge-ediff): Add name-{mine,other,base} args.	Stefan Monnier	2002-10-04	1	-6/+11
*	(smerge-diff-buffer-name): Default to vc-diff.	Stefan Monnier	2002-09-03	1	-21/+50
*	Use find-file-hook instead of find-file-hooks.	Stefan Monnier	2002-08-15	1	-2/+2
*	(smerge-match-conflict): Fix typo.	Stefan Monnier	2001-11-15	1	-5/+11
*	(smerge-mode): Check if `font-lock-mode' is bound	Gerd Moellmann	2001-07-31	1	-3/+3
*	(smerge-mode): Force font-lock-multiline to t.	Stefan Monnier	2001-05-10	1	-1/+2
*	(font-lock-keywords, font-lock-mode): Don't bind, just declare.	Stefan Monnier	2001-03-07	1	-3/+3
*	(smerge-font-lock-keywords): Relax submatch 1.	Stefan Monnier	2001-01-25	1	-2/+2
*	* empty log message *	Stefan Monnier	2000-12-23	1	-39/+1
*	(smerge-basic-map): Use `=' rather than `d'.	Stefan Monnier	2000-12-22	1	-2/+8
*	(smerge-basic-map): Use `=' rather than `d'.	Stefan Monnier	2000-12-22	1	-7/+13
*	(smerge-diff): Setup the buffer's default-directory	Stefan Monnier	2000-10-06	1	-3/+12
*	(smerge-mine-face, smerge-other-face, smerge-base-face, smerge-markers-face):	Miles Bader	2000-10-05	1	-6/+21
*	(smerge-mode-menu): Doc fix.	Stefan Monnier	2000-08-16	1	-4/+6
*	(smerge-mode-menu): Fill it out.	Dave Love	2000-07-21	1	-2/+22
*	(smerge-diff-switches): Don't use list* in defcustom.	Dave Love	2000-05-25	1	-3/+11
*	(smerge-auto-leave): New function and variable.	Stefan Monnier	2000-03-22	1	-41/+40
*	New file. Provides a simple minor-mode for files containing	Stefan Monnier	1999-12-09	1	-0/+453