Mercurial > hg > ConflictEditor

changeset 8:fca19925366c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename the button to find conflicts
author Dirk Olmes <dirk@xanthippe.ping.de>
date Tue, 13 Sep 2011 02:07:14 +0200
parents e4275005761d
children e7d9a9176e08
files conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java	Tue Sep 13 01:55:28 2011 +0200
+++ b/conflict-editor/src/main/java/de/codedo/conflicteditor/gui/ConflictEditorFrame.java	Tue Sep 13 02:07:14 2011 +0200
@@ -41,7 +41,7 @@
     {
         JLabel label = new JLabel("Database URL:");
         _databaseUrlTextField = new JTextField(40);
-        _connectButton = new JButton("Connect");
+        _connectButton = new JButton("Find Conflicts");
 
         JPanel databaseUrlPanel = new JPanel();
         databaseUrlPanel.setLayout(new FlowLayout());