Mercurial > hg4j
diff src/org/tmatesoft/hg/internal/Internals.java @ 705:b4242b7e7dfe
Merge command: implement conflict resolution alternatives
| author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
|---|---|
| date | Thu, 15 Aug 2013 18:43:50 +0200 |
| parents | fba85bc1dfb8 |
| children | a62079bc422b |
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/internal/Internals.java Wed Aug 14 20:07:26 2013 +0200 +++ b/src/org/tmatesoft/hg/internal/Internals.java Thu Aug 15 18:43:50 2013 +0200 @@ -513,6 +513,10 @@ public RevlogStream resolveStoreFile(Path path) { return streamProvider.getStoreFile(path, false); } + + public Transaction.Factory getTransactionFactory() { + return new COWTransaction.Factory(); + } // marker method public static IllegalStateException notImplemented() {