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/ModelUtilsTest.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/ModelUtilsTest.java b/src/test/java/com/gitblit/tests/ModelUtilsTest.java
index 9dd29b6..e34e0aa 100644
--- a/src/test/java/com/gitblit/tests/ModelUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/ModelUtilsTest.java
@@ -1,16 +1,12 @@
package com.gitblit.tests;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import org.junit.After;
import org.junit.Test;
import com.gitblit.Constants;
import com.gitblit.utils.ModelUtils;
-public class ModelUtilsTest {
+public class ModelUtilsTest extends GitblitUnitTest {
@After
public void resetPrefix()
--
Gitblit v1.9.1