commit fa47f39ae4872923bffcb8b128c12aa5d6da9351
author Michael Keppler <Michael.Keppler@gmx.de> Tue Apr 16 12:17:21 2019 +0100
committer Michael Keppler <michael.keppler@gmx.de> Tue Apr 16 16:46:22 2019 -0400
tree 1ce7edb379049ec50e321ca770602e1d2a39a874
parent 8a4ad4a088316cdc82f2dc49634ce5fc7ddf8e71

Fix merge dialog shortcut conflicts

Bug:546387
Change-Id: I92dab00424c938baa16c0d9c3708eae7835e4486
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>

org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties

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 854598d..aa6a912 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_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)