HCoop
/
bpt
/
emacs.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
(smerge-remove-props, smerge-refine):
[bpt/emacs.git]
/
lisp
/
smerge-mode.el
2009-09-08
Stefan Monnier
(smerge-remove-props, smerge-refine):
blob
|
commitdiff
|
raw
2009-09-01
Glenn Morris
Mark face aliases with "-face" suffix as obsolete.
blob
|
commitdiff
|
raw
|
diff to current
2009-02-02
Thien-Thi Nguyen
(smerge-start-session): Add interactive spec.
blob
|
commitdiff
|
raw
|
diff to current
2009-01-05
Glenn Morris
Add 2009 to copyright years.
blob
|
commitdiff
|
raw
|
diff to current
2008-10-28
Stefan Monnier
Require diff-mode at run-time as well.
blob
|
commitdiff
|
raw
|
diff to current
2008-09-30
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-09-05
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-09-02
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-08-18
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-08-12
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-07-21
Thien-Thi Nguyen
Make auto-refining a minor mode, and diff- and smerge...
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-07-17
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-06-17
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-06-01
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-18
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-16
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-14
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-12
Stefan Monnier
(smerge-apply-resolution-patch): Don't pass nil to...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-11
Reiner Steib
(smerge-start-session): Revert unintended change in...
blob
|
commitdiff
|
raw
|
diff to current
2008-05-11
Glenn Morris
Re-fill copyright years.
blob
|
commitdiff
|
raw
|
diff to current
2008-05-10
Reiner Steib
(smerge-command-prefix): Fix custom type.
blob
|
commitdiff
|
raw
|
diff to current
2008-05-10
Reiner Steib
(smerge-command-prefix): Fix custom type.
blob
|
commitdiff
|
raw
|
diff to current
2008-05-08
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-06
Glenn Morris
Switch to recommended form of GPLv3 permissions notice.
blob
|
commitdiff
|
raw
|
diff to current
2008-05-05
Stefan Monnier
(smerge-start-session): Don't call smerge-next if
blob
|
commitdiff
|
raw
|
diff to current
2008-05-04
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-05-02
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-29
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-24
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-23
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-18
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-04-11
Stefan Monnier
(smerge-apply-resolution-patch): Fix typo.
blob
|
commitdiff
|
raw
|
diff to current
2008-04-05
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-03-31
Stefan Monnier
(smerge-apply-resolution-patch): New fun.
blob
|
commitdiff
|
raw
|
diff to current
2008-03-31
Stefan Monnier
(smerge-refine): Allow highlighting other subparts...
blob
|
commitdiff
|
raw
|
diff to current
2008-03-10
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-03-01
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-02-25
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-02-24
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-02-13
Stefan Monnier
(smerge-auto-combine-max-separation): New var.
blob
|
commitdiff
|
raw
|
diff to current
2008-02-04
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-02-01
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-02-01
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-31
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-30
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2008-01-30
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-29
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-22
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-16
Dan Nicolaescu
* smerge-mode.el (smerge-start-session): Rename from...
blob
|
commitdiff
|
raw
|
diff to current
2008-01-15
Stefan Monnier
(smerge-refine): Also work on "same change conflicts".
blob
|
commitdiff
|
raw
|
diff to current
2008-01-14
Dan Nicolaescu
* smerge-mode.el (smerge-auto): New function.
blob
|
commitdiff
|
raw
|
diff to current
2008-01-09
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2008-01-08
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2008-01-07
Glenn Morris
Add 2008 to copyright years.
blob
|
commitdiff
|
raw
|
diff to current
2008-01-02
Miles Bader
Merge from emacs--rel--22, gnus--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-12-28
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-12-16
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-12-06
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-12-06
Miles Bader
Merge from emacs--rel--22, gnus--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-12-06
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-11-21
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-11-19
Dan Nicolaescu
* progmodes/octave-mod.el (inferior-octave-send-list...
blob
|
commitdiff
|
raw
|
diff to current
2007-11-11
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-11-11
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-11-09
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-11-08
Stefan Monnier
(smerge-refine-subst): Pass "-d" to diff.
blob
|
commitdiff
|
raw
|
diff to current
2007-10-30
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-30
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-27
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-10-27
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-20
Dan Nicolaescu
* term/x-win.el (x-gtk-stock-map, icon-map-list)
blob
|
commitdiff
|
raw
|
diff to current
2007-10-20
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-10-20
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-10-20
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-20
Stefan Monnier
(smerge-auto-refine): New var.
blob
|
commitdiff
|
raw
|
diff to current
2007-10-19
Stefan Monnier
Add word-granularity refinement.
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-18
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-16
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-15
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-11
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-10-09
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-10-09
Stefan Monnier
(smerge-refine-chopup-region): Add `preproc' argument.
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-08-21
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-08-16
Stefan Monnier
(smerge-resolve): New arg `safe'.
blob
|
commitdiff
|
raw
|
diff to current
2007-07-31
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-07-27
Miles Bader
Merge from emacs--devo--0
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
2007-07-26
Miles Bader
Merge from emacs--rel--22
blob
|
commitdiff
|
raw
|
diff to current
next