Mark merge point of js2-mode.

diff --cc packages/js2-mode/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c531d9867f6c223be1daf0f6da7538feb11966d8
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/packages/js2-mode/.gitignore
@@@ -1,0 -1,0 +1,1 @@@
++*.elc

diff --cc packages/js2-mode/.travis.yml
index 0000000000000000000000000000000000000000,bb0a9e077a3576823ffb49ee4db5aff7cb83a1c8..bb0a9e077a3576823ffb49ee4db5aff7cb83a1c8
mode 000000,100644..100644
--- /dev/null
--- 2/.travis.yml
+++ b/packages/js2-mode/.travis.yml

diff --cc packages/js2-mode/Makefile
index 0000000000000000000000000000000000000000,f86786fb8264dc57b64c292ced2d00cc028dfcc1..f86786fb8264dc57b64c292ced2d00cc028dfcc1
mode 000000,100644..100644
--- /dev/null
--- 2/Makefile
+++ b/packages/js2-mode/Makefile

diff --cc packages/js2-mode/README.md
index 0000000000000000000000000000000000000000,9065cdfe319c2665160de98893ebf45517d82f59..9065cdfe319c2665160de98893ebf45517d82f59
mode 000000,100644..100644
--- /dev/null
--- 2/README.md
+++ b/packages/js2-mode/README.md

diff --cc packages/js2-mode/tests/externs.el
index 0000000000000000000000000000000000000000,7860058d4f674457f9b19b6e92d99f54a2634fc2..7860058d4f674457f9b19b6e92d99f54a2634fc2
mode 000000,100644..100644
--- /dev/null
--- 2/tests/externs.el
+++ b/packages/js2-mode/tests/externs.el

diff --cc packages/js2-mode/tests/indent.el
index 0000000000000000000000000000000000000000,953b8a6c4ce9efbb43f7b20264c178f3933b5a98..953b8a6c4ce9efbb43f7b20264c178f3933b5a98
mode 000000,100644..100644
--- /dev/null
--- 2/tests/indent.el
+++ b/packages/js2-mode/tests/indent.el

diff --cc packages/js2-mode/tests/parser.el
index 0000000000000000000000000000000000000000,3c05c4b5ef9e5042ee0eeb046da2ccf74462e3cf..3c05c4b5ef9e5042ee0eeb046da2ccf74462e3cf
mode 000000,100644..100644
--- /dev/null
--- 2/tests/parser.el
+++ b/packages/js2-mode/tests/parser.el