Fix source-dependencies/relative-source-error to use explicit reloads…

…. Ref #923. Conflicts: sbt/src/sbt-test/source-dependencies/relative-source-error/test
sbt · Mar 21, 2014 · beddc73 · beddc73
1 parent b638a3f
commit beddc73
Showing 1 changed file with 1 addition and 6 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,12 +1,7 @@
 $ 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
+> compile