# HG changeset patch
# User Artem Tikhomirov <tikhomirov.artem@gmail.com>
# Date 1371650591 -7200
# Node ID a8ce405da1f5c259ba0b6bd6b177502f3cedc304
# Parent  9ef1fab9f5e3d51d70941121dc27410e28069c2d
v1.2 line of dev: update versions, use patch merge code by default

diff -r 9ef1fab9f5e3 -r a8ce405da1f5 build.gradle
--- a/build.gradle	Tue Jun 11 16:32:12 2013 +0200
+++ b/build.gradle	Wed Jun 19 16:03:11 2013 +0200
@@ -16,7 +16,7 @@
  */
 def isRelease = false
 
-  version = '1.1.0-SNAPSHOT'
+  version = '1.2.0-SNAPSHOT'
   description = 'Pure Java API and Toolkit for Mercurial DVCS'
   group = 'org.tmatesoft.hg4j'
   
diff -r 9ef1fab9f5e3 -r a8ce405da1f5 build.xml
--- a/build.xml	Tue Jun 11 16:32:12 2013 +0200
+++ b/build.xml	Wed Jun 19 16:03:11 2013 +0200
@@ -27,7 +27,7 @@
 
 	<property name="junit.jar" value="lib/junit-4.8.2.jar" />
 	<property name="ver.qualifier" value="" />
-	<property name="version.lib" value="1.1.0" />
+	<property name="version.lib" value="1.2" />
 	<property name="version.jar" value="${version.lib}${ver.qualifier}" />
 	<property name="compile-with-debug" value="yes"/>
 
diff -r 9ef1fab9f5e3 -r a8ce405da1f5 src/org/tmatesoft/hg/internal/Internals.java
--- a/src/org/tmatesoft/hg/internal/Internals.java	Tue Jun 11 16:32:12 2013 +0200
+++ b/src/org/tmatesoft/hg/internal/Internals.java	Wed Jun 19 16:03:11 2013 +0200
@@ -142,7 +142,7 @@
 		final PropertyMarshal pm = new PropertyMarshal(ctx);
 		boolean shallCacheRevlogsInRepo = pm.getBoolean(CFG_PROPERTY_REVLOG_STREAM_CACHE, true);
 		streamProvider = new RevlogStreamFactory(this, shallCacheRevlogsInRepo); 
-		shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, false);
+		shallMergePatches = pm.getBoolean(Internals.CFG_PROPERTY_PATCH_MERGE, true);
 	}
 	
 	public boolean isInvalid() {