Merge branch 'master' of git.labs.intellij.net:idea/community

platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffStatusBar.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package com.intellij.openapi.diff.ex;
 
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
-import com.intellij.ui.IdeBorderFactory;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -109,8 +108,7 @@ public class DiffStatusBar extends JPanel {
       }
     };
     setLayout(new BorderLayout());
-    setBorder(BorderFactory.createCompoundBorder(IdeBorderFactory.createBorder(),
-                                                 BorderFactory.createEmptyBorder(3, 20, 3, 20)));
+    setBorder(BorderFactory.createEmptyBorder(3, 20, 3, 20));
 
     add(myTextLabel, BorderLayout.WEST);
     Box box = Box.createHorizontalBox();

plugins/git4idea/src/git4idea/branch/GitMergeOperation.java

@@ -159,7 +159,7 @@ class GitMergeOperation extends GitBranchOperation {
 
   @Override
   protected void notifySuccess(@NotNull String message) {
-    if (!myLocalBranch) {
+    if (isRemoteBranch() || isMasterBranch()) {
       super.notifySuccess(message);
     }
     else {
@@ -169,6 +169,14 @@ class GitMergeOperation extends GitBranchOperation {
     }
   }
 
+  private boolean isMasterBranch() {
+    return myBranchToMerge.equals("master");
+  }
+
+  private boolean isRemoteBranch() {
+    return !myLocalBranch;
+  }
+
   private boolean resolveConflicts() {
     if (!myConflictedRepositories.isEmpty()) {
       return new MyMergeConflictResolver().merge();