diff options
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.properties | 2 |
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 0ee3446e15..ac3f2bc514 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 |