Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/models/RepositoryModel.java

@@ -88,6 +88,7 @@
   public boolean acceptNewPatchsets;

   public boolean acceptNewTickets;

   public boolean requireApproval;
   public String mergeTo;



   public transient boolean isCollectingGarbage;

   public Date lastGC;