Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-04-16 11:17:21 +0000
committerMichael Keppler2019-04-16 20:46:22 +0000
commitfa47f39ae4872923bffcb8b128c12aa5d6da9351 (patch)
tree1ce7edb379049ec50e321ca770602e1d2a39a874
parent8a4ad4a088316cdc82f2dc49634ce5fc7ddf8e71 (diff)
downloadegit-fa47f39ae4872923bffcb8b128c12aa5d6da9351.tar.gz
egit-fa47f39ae4872923bffcb8b128c12aa5d6da9351.tar.xz
egit-fa47f39ae4872923bffcb8b128c12aa5d6da9351.zip
Fix merge dialog shortcut conflicts
Bug:546387 Change-Id: I92dab00424c938baa16c0d9c3708eae7835e4486 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties4
1 files changed, 2 insertions, 2 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 854598dd90..aa6a9128ac 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
@@ -1224,8 +1224,8 @@ MergeTargetSelectionDialog_SelectRefWithBranch=Select a branch or tag to merge i
MergeTargetSelectionDialog_TitleMerge=Merge Branch
MergeTargetSelectionDialog_TitleMergeWithBranch=Merge ''{0}''
MergeTargetSelectionDialog_FastForwardGroup=Fast forward options
-MergeTargetSelectionDialog_FastForwardButton=If a fast-forward, &only update the branch pointer
-MergeTargetSelectionDialog_NoFastForwardButton=If a fast-forward, create a &merge commit
+MergeTargetSelectionDialog_FastForwardButton=If a fast-forward, only &update the branch pointer
+MergeTargetSelectionDialog_NoFastForwardButton=If a fast-forward, create a m&erge commit
MergeTargetSelectionDialog_OnlyFastForwardButton=If &not a fast-forward, fail
MergeTargetSelectionDialog_MergeTypeGroup=Merge options
MergeTargetSelectionDialog_MergeTypeCommitButton=&Commit (commit the result)

Back to the top