Fixed bug in merge: improper use of force and failing on FORCED result

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/test/java/com/gitblit/tests/FileUtilsTest.java

@@ -15,16 +15,13 @@
 */

package com.gitblit.tests;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import java.io.File;



import org.junit.Test;



import com.gitblit.utils.FileUtils;



public class FileUtilsTest {

public class FileUtilsTest extends GitblitUnitTest {



   @Test

   public void testReadContent() throws Exception {