index
:
guile-emacs
master
GNU Emacs in guile scheme
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
lisp
/
smerge-mode.el
Commit message (
Expand
)
Author
Age
Files
Lines
*
(smerge-start-session): Add interactive spec.
Thien-Thi Nguyen
2009-02-02
1
-0
/
+1
*
Add 2009 to copyright years.
Glenn Morris
2009-01-05
1
-1
/
+1
*
Require diff-mode at run-time as well.
Stefan Monnier
2008-10-28
1
-1
/
+2
*
Make auto-refining a minor mode, and diff- and smerge- use it.
Thien-Thi Nguyen
2008-07-21
1
-7
/
+2
*
(smerge-apply-resolution-patch): Don't pass nil to `insert'.
Stefan Monnier
2008-05-12
1
-1
/
+1
*
(smerge-start-session): Revert unintended change in 2008-05-10T13:06:33Z!Rein...
Reiner Steib
2008-05-11
1
-1
/
+2
*
Re-fill copyright years.
Glenn Morris
2008-05-11
1
-8
/
+6
*
(smerge-command-prefix): Fix custom type.
Reiner Steib
2008-05-10
1
-7
/
+11
*
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris
2008-05-06
1
-6
/
+4
*
(smerge-start-session): Don't call smerge-next if
Stefan Monnier
2008-05-05
1
-1
/
+2
*
(smerge-apply-resolution-patch): Fix typo.
Stefan Monnier
2008-04-11
1
-21
/
+27
*
(smerge-apply-resolution-patch): New fun.
Stefan Monnier
2008-03-31
1
-27
/
+151
*
(smerge-refine): Allow highlighting other subparts in 3-way conflicts.
Stefan Monnier
2008-03-31
1
-9
/
+30
*
(smerge-auto-combine-max-separation): New var.
Stefan Monnier
2008-02-13
1
-0
/
+21
*
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
Dan Nicolaescu
2008-01-16
1
-1
/
+1
*
(smerge-refine): Also work on "same change conflicts".
Stefan Monnier
2008-01-15
1
-4
/
+32
*
* smerge-mode.el (smerge-auto): New function.
Dan Nicolaescu
2008-01-14
1
-0
/
+8
*
Merge from emacs--rel--22
Miles Bader
2008-01-08
1
-1
/
+1
|
\
|
*
Add 2008 to copyright years.
Glenn Morris
2008-01-07
1
-1
/
+1
*
|
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu
2007-11-19
1
-0
/
+1
*
|
(smerge-refine-subst): Pass "-d" to diff.
Stefan Monnier
2007-11-08
1
-3
/
+8
*
|
* term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu
2007-10-20
1
-0
/
+1
*
|
(smerge-auto-refine): New var.
Stefan Monnier
2007-10-20
1
-1
/
+13
*
|
Add word-granularity refinement.
Stefan Monnier
2007-10-19
1
-38
/
+135
*
|
(smerge-refine-chopup-region): Add `preproc' argument.
Stefan Monnier
2007-10-09
1
-25
/
+41
|
/
*
(smerge-resolve): New arg `safe'.
Stefan Monnier
2007-08-16
1
-5
/
+46
*
Switch license to GPLv3 or later.
Glenn Morris
2007-07-25
1
-1
/
+1
*
(smerge-remove-props): Don't mark the buffer modified.
Stefan Monnier
2007-03-08
1
-1
/
+5
*
Add 2007 to copyright years.
Glenn Morris
2007-01-21
1
-1
/
+1
*
Update my email address.
Stefan Monnier
2006-04-30
1
-1
/
+1
*
Update years in copyright notice; nfc.
Thien-Thi Nguyen
2006-02-06
1
-1
/
+1
*
Add 'tools' to file keywords.
Romain Francoise
2005-10-26
1
-1
/
+1
*
(smerge-remove-props): Cause re-highlighting of the whole conflict.
Stefan Monnier
2005-09-23
1
-1
/
+11
*
(smerge-resolve): Pass args to smerge-remove-props.
Richard M. Stallman
2005-09-09
1
-1
/
+1
*
(smerge-refined-change): Add :group.
Juanma Barranquero
2005-08-26
1
-1
/
+2
*
(smerge-remove-props): Make the args non-optional.
Stefan Monnier
2005-08-25
1
-6
/
+86
*
(smerge-basic-map): Bind smerge-combine-with-next.
Stefan Monnier
2005-08-22
1
-28
/
+84
*
Update years in copyright notice; nfc.
Thien-Thi Nguyen
2005-08-06
1
-1
/
+2
*
(smerge-ediff): Use insert-buffer-substring.
Stefan Monnier
2005-07-26
1
-1
/
+1
*
Update FSF's address.
Lute Kamstra
2005-07-04
1
-2
/
+2
*
(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:
[email protected]
/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
[next]