Mercurial > jhg
diff src/org/tmatesoft/hg/internal/Internals.java @ 643:a8ce405da1f5
v1.2 line of dev: update versions, use patch merge code by default
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Wed, 19 Jun 2013 16:03:11 +0200 |
| parents | 6526d8adbc0f |
| children | c75297c17867 |
line wrap: on
line diff
--- 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() {