From 3ec05ca91f7744f647ce39da36377e15e8c0bf89 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 7 Apr 2011 15:23:45 +0400 Subject: [PATCH] GitPushActiveBranchesDialog#Commit better toString() --- .../src/git4idea/checkin/GitPushActiveBranchesDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java index e119aa3f7859..ff28bbc772f4 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java @@ -978,7 +978,8 @@ public class GitPushActiveBranchesDialog extends DialogWrapper { @Override public String toString() { - return revision.toString(); + String mergeCommitStr = isMerge ? " " + GitBundle.getString("push.active.commit.node.merge") : ""; + return revision.toShortString() + " " + message + mergeCommitStr; } }