Lars Ingebrigtsen f577f59a52 Fix merge conflicts in network-stream-tests.el

2016-02-22 15:06:33 +11:00

..

calc

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

calendar

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

emacs-lisp

New function seq-map-indexed

2016-02-14 10:25:10 +01:00

eshell

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

gnus

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

international

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

legacy

-

2016-01-18 22:56:33 -08:00

mail

; Add 2016 to copyright years for files not in emacs-25 branch

2016-01-12 16:20:00 -05:00

net

Fix merge conflicts in network-stream-tests.el

2016-02-22 15:06:33 +11:00

progmodes

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

textmodes

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

url

* test/lisp/url/url-auth-tests.el (url-auth-test-digest-auth):

2016-02-12 21:18:13 -05:00

vc

* test/lisp/vc/vc-hg.el: Move from test/automated/.

2016-01-27 20:32:45 -05:00

abbrev-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

autorevert-tests.el

Merge missing commit from emacs-25 branch

2016-01-12 10:37:06 +01:00

character-fold-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

comint-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

descr-text-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

dired-tests.el

; Add 2016 to copyright years for files not in emacs-25 branch

2016-01-12 16:20:00 -05:00

electric-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

epg-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

faces-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

filenotify-tests.el

-

2016-02-09 14:23:53 -08:00

help-fns-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

htmlfontify-tests.el

; Add 2016 to copyright years for files not in emacs-25 branch

2016-01-12 16:20:00 -05:00

ibuffer-tests.el

; Add 2016 to copyright years for files not in emacs-25 branch

2016-01-12 16:20:00 -05:00

imenu-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

info-xref-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

isearch-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

json-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

man-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

minibuffer-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

obarray-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

ps-print-tests.el

; Add 2016 to copyright years for files not in emacs-25 branch

2016-01-12 16:20:00 -05:00

replace-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

simple-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

sort-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

subr-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

thingatpt-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00

xml-tests.el

Merge from origin/emacs-25

2016-01-11 22:48:07 -08:00