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/mock/MockRuntimeManager.java

@@ -137,7 +137,7 @@
   }

   @Override
   public IRuntimeManager setup() {
   public IRuntimeManager start() {
      return this;
   }
}