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/PushLogTest.java

@@ -28,7 +28,7 @@
import com.gitblit.models.RefLogEntry;

import com.gitblit.utils.RefLogUtils;



public class PushLogTest {

public class PushLogTest extends GitblitUnitTest {



   @Test

   public void testPushLog() throws IOException {