From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/test/java/com/gitblit/tests/PushLogTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/PushLogTest.java b/src/test/java/com/gitblit/tests/PushLogTest.java
index f5d5965..be097cc 100644
--- a/src/test/java/com/gitblit/tests/PushLogTest.java
+++ b/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 {
--
Gitblit v1.9.1