Mercurial > hg > easyhg

changeset 482:c6ea3eb00635

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix #229
author Chris Cannam
date Tue, 16 Aug 2011 17:13:35 +0100
parents 212093882e4a
children a582c6417004
files src/filestatuswidget.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/filestatuswidget.cpp	Mon Aug 15 17:23:54 2011 +0100
+++ b/src/filestatuswidget.cpp	Tue Aug 16 17:13:35 2011 +0100
@@ -79,7 +79,7 @@
     m_descriptions[FileStates::Missing] = tr("These files are recorded in the version control, but absent from your working folder.<br>"
                                              "If you intended to delete them, select them and use Remove to tell the version control system about it.<br>"
                                              "If you deleted them by accident, select them and use Revert to restore their previous contents.");
-    m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again.");
+    m_descriptions[FileStates::InConflict] = tr("These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again.");
     m_descriptions[FileStates::Unknown] = tr("These files are in your working folder but are not under version control.<br>"
 //                                             "Select a file and use Add to place it under version control or Ignore to remove it from this list.");
                                              "Select a file and use Add to place it under version control.");