Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Hermann2014-07-10 04:17:40 -0400
committerRobin Stocker2014-07-24 10:40:57 -0400
commit816de95133551638b5848b78ea48e4d9bf408e24 (patch)
tree96fa79cdce9b16032c88c43553f9c17b33bea811 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
parente45e16c09a5913ca08702b8dd76bf2c688f4a6ec (diff)
downloadegit-816de95133551638b5848b78ea48e4d9bf408e24.tar.gz
egit-816de95133551638b5848b78ea48e4d9bf408e24.tar.xz
egit-816de95133551638b5848b78ea48e4d9bf408e24.zip
Show an explanation when a merge is not possible
* Explain the reason the merge has failed instead of just showing an exception dialog "Cannot merge now". * Consolidate duplicate code into MergeActionHandler Change-Id: Ibdf1f9f7d3cdd55fae41c88eafeb0e6708ecfe42 Signed-off-by: Andreas Hermann <a.v.hermann@gmail.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 0ee3446e1..ac3f2bc51 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -1037,7 +1037,7 @@ BranchSelectionAndEditDialog_QuestionNewBranchNameMessage=Enter new name of the
BranchSelectionAndEditDialog_QuestionNewBranchTitle=New branch
BranchSelectionAndEditDialog_Rename=&Rename...
BranchSelectionAndEditDialog_Delete=&Delete
-MergeAction_CannotMerge=Cannot merge now
+MergeAction_CannotMerge=Merge Unavailable
MergeAction_HeadIsNoBranch=HEAD is not pointing to a branch
MergeAction_JobNameMerge=Merging with {0}
MergeAction_MergeCanceledMessage=The merge operation was canceled

Back to the top