Merge branch '106.164'
authorKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 27 Mar 2011 12:15:54 +0000 (16:15 +0400)
committerKirill Likhodedov <kirill.likhodedov@jetbrains.com>
Sun, 27 Mar 2011 12:15:54 +0000 (16:15 +0400)
Conflicts:
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java
plugins/git4idea/src/git4idea/checkin/GitPushRebaseProcess.java
plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java

1  2 
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java

index f81e88247a2036aaf14168c3c3cae4eac1a11622,6a5a28f0493b32207c2c6c35e5c33e5fc0937543..9ed2bc910fb6150d87b42faad04826947f64ec56
@@@ -34,7 -34,7 +34,8 @@@ import com.intellij.openapi.util.text.S
  import com.intellij.openapi.vcs.VcsBundle;
  import com.intellij.openapi.vcs.VcsException;
  import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
 +import com.intellij.openapi.vfs.CharsetToolkit;
+ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
  import com.intellij.openapi.vfs.VirtualFile;
  import com.intellij.projectImport.ProjectOpenProcessor;
  import com.intellij.ui.ColoredTableCellRenderer;