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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/main/java/com/gitblit/authority/AuthorityWorker.java

@@ -35,6 +35,7 @@
      return doRequest();

   }



   @Override

   protected void done() {

      parent.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));

      try {