diff options
| author | Stefan Lay | 2010-08-25 13:40:52 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2010-08-30 23:56:31 +0000 |
| commit | a0afa5b7cf320872a5976e6f1c5df2d41489a18e (patch) | |
| tree | c9b04947fe958465cd395fefccacb926fd958126 | |
| parent | df106a0d50304dda895fcb9538092d91cee769f8 (diff) | |
| download | egit-a0afa5b7cf320872a5976e6f1c5df2d41489a18e.tar.gz egit-a0afa5b7cf320872a5976e6f1c5df2d41489a18e.tar.xz egit-a0afa5b7cf320872a5976e6f1c5df2d41489a18e.zip | |
Remove "only fast forward" message from Merge Dialog
Change-Id: Ie77ce45855d70e15840a4acd553cb208173e57de
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
3 files changed, 1 insertions, 6 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index aaa2e714d8..48b094c691 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -2215,9 +2215,6 @@ public class UIText extends NLS { public static String MergeTargetSelectionDialog_ButtonMerge; /** */ - public static String MergeTargetSelectionDialog_OnlyFastForward; - - /** */ public static String MergeTargetSelectionDialog_SelectRef; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java index 67d662b8c7..652bdef4b2 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/MergeTargetSelectionDialog.java @@ -47,8 +47,7 @@ public class MergeTargetSelectionDialog extends AbstractBranchSelectionDialog { @Override protected String getMessageText() { - return UIText.MergeTargetSelectionDialog_SelectRef - + " " + UIText.MergeTargetSelectionDialog_OnlyFastForward; //$NON-NLS-1$ + return UIText.MergeTargetSelectionDialog_SelectRef; } @Override 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 951f3c3a10..bff07c0ae6 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 @@ -595,7 +595,6 @@ MergeAction_ProblemMerge=Problem during merge MergeAction_UnableMerge=Unable to merge. MergeAction_WrongRepositoryState=The Repository State {0} does not allow to merge MergeTargetSelectionDialog_ButtonMerge=&Merge -MergeTargetSelectionDialog_OnlyFastForward=Only fast-forward merges are currently possible. MergeTargetSelectionDialog_SelectRef=Select a branch or a tag other than the currently checked out branch or tag. MergeTargetSelectionDialog_TitleMerge=Merge: {0} |