# HG changeset patch
# User Chris Cannam
# Date 1313511215 -3600
# Node ID c6ea3eb006359c3c1be188f17df578ae44e80ba2
# Parent  212093882e4a4966317d95c6d8637775049ffe80
Fix #229

diff -r 212093882e4a -r c6ea3eb00635 src/filestatuswidget.cpp
--- 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.");