[Mercurial] Rewrote the HgMergeProvider functionality: get revision contents directly...
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 Aug 2010 11:31:37 +0000 (15:31 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Fri, 6 Aug 2010 11:31:37 +0000 (15:31 +0400)
commitd9e50899266204d5eb3f5d96722f9b0eedb6f524
tree14d3959a093e0bbc2b96337b4fbce8425ba82544
parentb21bd5cd6c29c73ab0b2c33b49a334f2aa4ce45d
[Mercurial] Rewrote the HgMergeProvider functionality: get revision contents directly, no need to start server and external script.
plugins/hg4idea/resources/python/filemerge.py [deleted file]
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java