Merge overrides in addition to merging the normal settings

James Moger

2014-03-17 08704c63e1c5d8a089d0dba58c5fa3ba119a32a7

 src/main/java/com/gitblit/git/GitDaemonService.java

@@ -68,6 +68,7 @@
   GitDaemonService(final String cmdName, final String cfgName) {

      command = cmdName.startsWith("git-") ? cmdName : "git-" + cmdName; //$NON-NLS-1$ //$NON-NLS-2$

      configKey = new SectionParser<ServiceConfig>() {

         @Override

         public ServiceConfig parse(final Config cfg) {

            return new ServiceConfig(GitDaemonService.this, cfg, cfgName);

         }