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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/main/java/com/gitblit/manager/IManager.java

@@ -17,7 +17,8 @@

public interface IManager {

   IManager setup();
   IManager start();

   IManager stop();

}