Merge emacs-25 into master (using imerge)

[gnu-emacs] / test / manual / etags / ETAGS.good_3

diff --git a/test/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
similarity index 100%
rename from test/etags/ETAGS.good_3
rename to test/manual/etags/ETAGS.good_3