Generate an error when the incremental compiler is given relative sou…

…rce files. Fixes #923. Review by @gkossakowski Conflicts: sbt/src/sbt-test/source-dependencies/relative-source-error/test
sbt · Mar 21, 2014 · 08f4da7 · 08f4da7
1 parent d0dab3c
commit 08f4da7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sbt/src/sbt-test/source-dependencies/relative-source-error/test b/sbt/src/sbt-test/source-dependencies/relative-source-error/test
@@ -1,7 +1,12 @@
 $ copy-file changes/relative.sbt build.sbt
+<<<<<<< HEAD
 > reload
 -> compile
 
 $ copy-file changes/absolute.sbt build.sbt
 > reload
+=======
+-> compile
+$ copy-file changes/absolute.sbt build.sbt
+>>>>>>> 2f683ef... Generate an error when the incremental compiler is given relative source files.  Fixes #923.
 > compile