[Mercurial] HgMergeProvider: handled several different merge situations. Added HgMerg...
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 11 Aug 2010 13:17:02 +0000 (17:17 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 11 Aug 2010 13:17:02 +0000 (17:17 +0400)
commit28d672af656234fb662a89808ffb6f2862bee9ee
tree030905bb573fc9a488866e501876dc8b953920a7
parente0a36acb25d4223555f980c8ea80a144e917dd80
[Mercurial] HgMergeProvider: handled several different merge situations. Added HgMergeProviderTestCase.
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/test/HgMergeProviderTestCase.java [new file with mode: 0644]