HCoop
/
bpt
/
emacs.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Trailing whitespace deleted.
[bpt/emacs.git]
/
lisp
/
smerge-mode.el
2003-02-04
Juanma Barranquero
Trailing whitespace deleted.
blob
|
commitdiff
|
raw
2002-10-10
Stefan Monnier
(smerge-ediff): Autoload.
blob
|
commitdiff
|
raw
|
diff to current
2002-10-10
Stefan Monnier
(smerge-ediff): Autoload.
blob
|
commitdiff
|
raw
|
diff to current
2002-10-04
Stefan Monnier
(smerge-ediff): Add name-{mine,other,base} args.
blob
|
commitdiff
|
raw
|
diff to current
2002-09-03
Stefan Monnier
(smerge-diff-buffer-name): Default to *vc-diff*.
blob
|
commitdiff
|
raw
|
diff to current
2002-08-15
Stefan Monnier
Use find-file-hook instead of find-file-hooks.
blob
|
commitdiff
|
raw
|
diff to current
2001-11-15
Stefan Monnier
(smerge-match-conflict): Fix typo.
blob
|
commitdiff
|
raw
|
diff to current
2001-07-31
Gerd Moellmann
(smerge-mode): Check if `font-lock-mode' is bound
blob
|
commitdiff
|
raw
|
diff to current
2001-05-10
Stefan Monnier
(smerge-mode): Force font-lock-multiline to t.
blob
|
commitdiff
|
raw
|
diff to current
2001-03-07
Stefan Monnier
(font-lock-keywords, font-lock-mode): Don't bind, just...
blob
|
commitdiff
|
raw
|
diff to current
2001-01-25
Stefan Monnier
(smerge-font-lock-keywords): Relax submatch 1.
blob
|
commitdiff
|
raw
|
diff to current
2000-12-23
Stefan Monnier
*** empty log message ***
blob
|
commitdiff
|
raw
|
diff to current
2000-12-22
Stefan Monnier
(smerge-basic-map): Use `=' rather than `d'.
blob
|
commitdiff
|
raw
|
diff to current
2000-12-22
Stefan Monnier
(smerge-basic-map): Use `=' rather than `d'.
blob
|
commitdiff
|
raw
|
diff to current
2000-10-06
Stefan Monnier
(smerge-diff): Setup the buffer's default-directory
blob
|
commitdiff
|
raw
|
diff to current
2000-10-05
Miles Bader
(smerge-mine-face, smerge-other-face, smerge-base-face...
blob
|
commitdiff
|
raw
|
diff to current
2000-08-16
Stefan Monnier
(smerge-mode-menu): Doc fix.
blob
|
commitdiff
|
raw
|
diff to current
2000-07-21
Dave Love
(smerge-mode-menu): Fill it out.
blob
|
commitdiff
|
raw
|
diff to current
2000-05-25
Dave Love
(smerge-diff-switches): Don't use list* in defcustom.
blob
|
commitdiff
|
raw
|
diff to current
2000-03-22
Stefan Monnier
(smerge-auto-leave): New function and variable.
blob
|
commitdiff
|
raw
|
diff to current
1999-12-09
Stefan Monnier
New file. Provides a simple minor-mode for files conta...
blob
|
commitdiff
|
raw
|
diff to current
HCoop / bpt / emacs.git / history