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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/main/java/com/gitblit/wicket/panels/CommitHeaderPanel.java

@@ -33,6 +33,7 @@
      add(new Label("commitid"));

      add(new Label("author"));

      add(new Label("date"));

      add(new Label("authorAvatar"));

   }



   public CommitHeaderPanel(String id, String repositoryName, RevCommit c) {