Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2011-01-15 18:24:39 -0500
committerMatthias Sohn2011-01-18 18:33:44 -0500
commit09c3bfafa6f912d4072495d24c1ffb1c9ca3543a (patch)
tree2162457457b21beaa46d9f6d8b63770d4c5edabf /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parent7d56679922146f2532f46fbf27141a303b14e526 (diff)
downloadegit-09c3bfafa6f912d4072495d24c1ffb1c9ca3543a.tar.gz
egit-09c3bfafa6f912d4072495d24c1ffb1c9ca3543a.tar.xz
egit-09c3bfafa6f912d4072495d24c1ffb1c9ca3543a.zip
Implement a merge comand that works from the History page
Change-Id: I2fa2971e25b04595cb37e23d72c17ae7b124e09a Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties4
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
index 84f4a8140..86fa308ba 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
@@ -136,6 +136,7 @@ GitHistoryPage_ResetMenuLabel=&Reset
GitHistoryPage_ResetMixedMenuLabel=&Mixed
GitHistoryPage_ResetSoftMenuLabel=&Soft
GitHistoryPage_revertMenuItem=Revert Commit
+GitHistoryPage_mergeMenuItem=Merge
GitHistoryPage_SetAsBaselineMenuLabel=&Set as Baseline
GitHistoryPage_ShowAllBranchesMenuLabel=All &Branches
GitHistoryPage_FilterSubMenuLabel=&Filter
@@ -890,6 +891,9 @@ CommitAction_MergeHeadErrorTitle=Inconsistent Merge state
CommitActionHandler_calculatingChanges=Calculating changes in selected repositories
CommitActionHandler_repository=Repository: {0}
+MergeHandler_SelectBranchMessage=There is more than one ref for this commit. Please select the ref you want to merge.
+MergeHandler_SelectBranchTitle=Select a ref for merge
+
CommitFileDiffViewer_CanNotOpenCompareEditorTitle=Can not open Compare Editor
CommitFileDiffViewer_CompareMenuLabel=Compare with &version in ancestor
CommitFileDiffViewer_FileDoesNotExist=File {0} does not exist in working tree

Back to the top