code.delx.au - gnu-emacs/history - lisp/vc/smerge-mode.el

]> code.delx.au - gnu-emacs/history - lisp/vc/smerge-mode.el

[gnu-emacs] / lisp / vc / smerge-mode.el

2016-04-24	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-24	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-24	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-18	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-18	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-18	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-18	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-18	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-12	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-11	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-11	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-11	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-11	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-11	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-03	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-03	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-03	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-02	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-02	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-02	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-04-02	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-23	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-23	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-23	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-22	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-22	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-22	Paul Eggert	-	blob \| commitdiff \| raw
2016-03-22	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-22	Paul Eggert	-	blob \| commitdiff \| raw
2016-03-11	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-11	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-11	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-11	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-03-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-22	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-22	Lars Ingebrigtsen	Fix merge conflicts in network-stream-tests.el	blob \| commitdiff \| raw
2016-02-15	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-15	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	-	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	-	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-09	Paul Eggert	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-04	John Wiegley	; Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-02-04	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw
2016-01-31	Matthew Carter	Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs	blob \| commitdiff \| raw
2016-01-31	Glenn Morris	Change Smerge "Mine" and "Other" for "Upper" and "Lower...	blob \| commitdiff \| raw
2016-01-14	K. Handa	Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs	blob \| commitdiff \| raw \| diff to current
2016-01-12	John Wiegley	Merge from origin/emacs-25	blob \| commitdiff \| raw \| diff to current
2016-01-03	K. Handa	Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs	blob \| commitdiff \| raw \| diff to current
2016-01-03	John Wiegley	Merge branch 'emacs-25-merge'	blob \| commitdiff \| raw \| diff to current
2016-01-01	Paul Eggert	Update copyright year to 2016	blob \| commitdiff \| raw \| diff to current
2015-12-30	John Wiegley	Merge emacs-25 into master (using imerge)	blob \| commitdiff \| raw \| diff to current
2015-12-04	Alan Mackenzie	Merge branch 'scratch/follow' of /home/acm/emacs/emacs...	blob \| commitdiff \| raw \| diff to current
2015-11-17	Paul Eggert	Fix docstring quoting problems with ‘ '’	blob \| commitdiff \| raw \| diff to current
2015-06-19	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-06-02	Glenn Morris	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-06-02	Glenn Morris	; Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-04-04	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-04-04	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-04-04	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-04-04	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-03-29	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-03-29	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-03-29	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-03-23	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
2015-03-23	Paul Eggert	Merge from origin/emacs-24	blob \| commitdiff \| raw \| diff to current
next

RSS Atom