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

James Moger

2014-03-06 d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd

 src/main/java/com/gitblit/utils/ModelUtils.java

@@ -38,7 +38,7 @@
         userRepoPrefix = Constants.DEFAULT_USER_REPOSITORY_PREFIX;
         return;
      }
		

      String newPrefix = prefix.replace('\\', '/');
      if (prefix.charAt(0) == '/') {
         newPrefix = prefix.substring(1);