Mercurial > hg4j

diff src/org/tmatesoft/hg/core/HgRepoFacade.java @ 704:7743a9c10bfa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge command introduced
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 14 Aug 2013 20:07:26 +0200
parents 4fd317a2fecf
children
line wrap: on
line diff
--- a/src/org/tmatesoft/hg/core/HgRepoFacade.java	Wed Aug 14 14:51:51 2013 +0200
+++ b/src/org/tmatesoft/hg/core/HgRepoFacade.java	Wed Aug 14 20:07:26 2013 +0200
@@ -173,4 +173,8 @@
 	public HgPullCommand createPullCommand() {
 		return new HgPullCommand(repo);
 	}
+
+	public HgMergeCommand createMergeCommand() {
+		return new HgMergeCommand(repo);
+	}
 }