Merge branch 'master' of git.labs.intellij.net:idea/community
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 9 Jun 2010 11:50:36 +0000 (15:50 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Wed, 9 Jun 2010 11:50:36 +0000 (15:50 +0400)
commit1648c79453bbd00322c06f6122fd633b697e02f3
tree4c983ba10eb8cca87eaa9c1343440606659146c1
parentf40b8abd6b0c1d1d714c770bf3d63e742d30ef68
parentfdcfc0fde585bd9085b2b79a36fb4d05e3ed34d8
Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgVirtualFileListener.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgTestCase.java
Merge branch 'master' of git.labs.intellij.net:idea/ultimate

Conflicts:
plugins/PerforceIntegration/src/org/jetbrains/idea/perforce/application/PerforceCheckinEnvironment.java
14 files changed:
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgCommandService.java
plugins/hg4idea/src/org/zmlx/hg4idea/command/HgResolveCommand.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/AbstractHgTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgAddTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCatTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgCopyTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgDeleteTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgFromClonedTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgLogTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgMoveTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRenameTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgResolveConflictTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgRevertTestCase.java
plugins/hg4idea/testSrc/org/zmlx/hg4idea/HgUpdateTestCase.java