Mercurial > hg4j
comparison src/org/tmatesoft/hg/core/HgRepoFacade.java @ 704:7743a9c10bfa
Merge command introduced
author | Artem Tikhomirov <tikhomirov.artem@gmail.com> |
---|---|
date | Wed, 14 Aug 2013 20:07:26 +0200 |
parents | 4fd317a2fecf |
children |
comparison
equal
deleted
inserted
replaced
703:7839ff0bfd78 | 704:7743a9c10bfa |
---|---|
171 } | 171 } |
172 | 172 |
173 public HgPullCommand createPullCommand() { | 173 public HgPullCommand createPullCommand() { |
174 return new HgPullCommand(repo); | 174 return new HgPullCommand(repo); |
175 } | 175 } |
176 | |
177 public HgMergeCommand createMergeCommand() { | |
178 return new HgMergeCommand(repo); | |
179 } | |
176 } | 180 } |