2006-05-03 |
Karoly Lorentey | Merged from emacs@sv.gnu.org |
blob | commitdiff | raw |
2006-04-30 |
Stefan Monnier | Update my email address. |
blob | commitdiff | raw |
2006-02-12 |
Karoly Lorentey | Merged from emacs@sv.gnu.org |
blob | commitdiff | raw | diff to current |
2006-02-06 |
Thien-Thi Nguyen | Update years in copyright notice; nfc. |
blob | commitdiff | raw | diff to current |
2005-11-01 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 142-148... |
blob | commitdiff | raw | diff to current |
2005-10-26 |
Romain Francoise | Add 'tools' to file keywords. |
blob | commitdiff | raw | diff to current |
2005-10-09 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 118-132... |
blob | commitdiff | raw | diff to current |
2005-09-23 |
Stefan Monnier | (smerge-remove-props): Cause re-highlighting of the... |
blob | commitdiff | raw | diff to current |
2005-09-09 |
Karoly Lorentey | Merged in changes from CVS trunk. |
blob | commitdiff | raw | diff to current |
2005-09-09 |
Richard M. Stallman | (smerge-resolve): Pass args to smerge-remove-props. |
blob | commitdiff | raw | diff to current |
2005-09-04 |
Karoly Lorentey | Merged in changes from CVS trunk. Plus added lisp... |
blob | commitdiff | raw | diff to current |
2005-08-26 |
Juanma Barranquero | (smerge-refined-change): Add :group. |
blob | commitdiff | raw | diff to current |
2005-08-25 |
Stefan Monnier | (smerge-remove-props): Make the args non-optional. |
blob | commitdiff | raw | diff to current |
2005-08-22 |
Stefan Monnier | (smerge-basic-map): Bind smerge-combine-with-next. |
blob | commitdiff | raw | diff to current |
2005-08-06 |
Thien-Thi Nguyen | Update years in copyright notice; nfc. |
blob | commitdiff | raw | diff to current |
2005-07-26 |
Stefan Monnier | (smerge-ediff): Use insert-buffer-substring. |
blob | commitdiff | raw | diff to current |
2005-07-05 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 469) |
blob | commitdiff | raw | diff to current |
2005-07-05 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 83-87, 449... |
blob | commitdiff | raw | diff to current |
2005-07-04 |
Lute Kamstra | Update FSF's address. |
blob | commitdiff | raw | diff to current |
2005-07-03 |
Richard M. Stallman | (smerge-mode): Add duplicate defvar near top. |
blob | commitdiff | raw | diff to current |
2005-06-21 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 423-434) |
blob | commitdiff | raw | diff to current |
2005-06-16 |
Juanma Barranquero | (smerge-ensure-match): Don't use `format' on `error... |
blob | commitdiff | raw | diff to current |
2005-06-15 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 80-82, 350... |
blob | commitdiff | raw | diff to current |
2005-06-10 |
Miles Bader | Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk... |
blob | commitdiff | raw | diff to current |
2005-04-11 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 59, 240... |
blob | commitdiff | raw | diff to current |
2005-04-08 |
Dan Nicolaescu | * mh-customize.el (mh-speedbar-selected-folder-face... |
blob | commitdiff | raw | diff to current |
2005-04-04 |
Karoly Lorentey | Merged from miles@gnu.org--gnu-2005 (patch 45-55, 214... |
blob | commitdiff | raw | diff to current |
2005-04-04 |
Lute Kamstra | (smerge-mode): Specify :group. |
blob | commitdiff | raw | diff to current |
2004-05-01 |
Karoly Lorentey | Merged in changes from CVS trunk. |
blob | commitdiff | raw | diff to current |
2004-04-30 |
Juanma Barranquero | (smerge-diff-switches): Fix typo in docstring. |
blob | commitdiff | raw | diff to current |
2004-04-16 |
Karoly Lorentey | Merged in changes from CVS trunk. |
blob | commitdiff | raw | diff to current |
2004-04-15 |
Stefan Monnier | (smerge-match-conflict): Fix last change. |
blob | commitdiff | raw | diff to current |
2004-04-15 |
Stefan Monnier | (smerge-match-conflict): Try to do something sensible |
blob | commitdiff | raw | diff to current |
2004-04-15 |
Karoly Lorentey | Merged in changes from CVS trunk. |
blob | commitdiff | raw | diff to current |
2004-04-14 |
Stefan Monnier | (smerge-popup-context-menu): Use it. |
blob | commitdiff | raw | diff to current |
2004-03-25 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-23 |
Stefan Monnier | (smerge-mode-menu): Fix activate pred for resolve. |
blob | commitdiff | raw | diff to current |
2004-03-19 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-16 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-16 |
Masatake YAMATO | (smerge-popup-context-menu): Put `unwind-protect' arrou... |
blob | commitdiff | raw | diff to current |
2004-03-15 |
Masatake YAMATO | 2004-03-15 Masatake YAMATO <jet@gyve.org> |
blob | commitdiff | raw | diff to current |
2004-03-11 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-10 |
Stefan Monnier | (smerge-check-cache, smerge-check): New var and fun. |
blob | commitdiff | raw | diff to current |
2004-03-08 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-07 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-03-01 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-28 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-28 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-26 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-24 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-20 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-20 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-19 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-18 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-17 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-03 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-02-02 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-26 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-23 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-22 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-12 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-11 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-10 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-06 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-05 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-03 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-03 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2004-01-02 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2003-12-30 |
Karoly Lorentey | Merged in changes from CVS head |
blob | commitdiff | raw | diff to current |
2003-12-29 |
Karoly Lorentey | Merged in changes from CVS head |
blob | commitdiff | raw | diff to current |
2003-12-28 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2003-12-28 |
Karoly Lorentey | Merged in changes from CVS HEAD |
blob | commitdiff | raw | diff to current |
2003-12-24 |
Karoly Lorentey | tag of miles@gnu.org--gnu-2003/emacs--cvs-trunk--0... |
blob | commitdiff | raw | diff to current |
2003-10-06 |
Dave Love | Previous change was bogus. Something odd in pcl-cvs... |
blob | commitdiff | raw | diff to current |
2003-10-06 |
Dave Love | Comment. |
blob | commitdiff | raw | diff to current |
2003-09-01 |
Miles Bader | Add arch taglines |
blob | commitdiff | raw | diff to current |
2003-02-04 |
Juanma Barranquero | Trailing whitespace deleted. |
blob | commitdiff | raw | diff to current |
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 |
|