Mercurial > hg > easyhg

changeset 599:538b6ae5c272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Tue, 24 Apr 2012 16:56:29 +0100
parents 5bf32465213c (current diff) 5271c3b97eb2 (diff)
children 641ccce7c771
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Apr 24 16:55:26 2012 +0100
+++ b/.hgtags	Tue Apr 24 16:56:29 2012 +0100
@@ -19,3 +19,4 @@
 ca943d5147697d8a63d835e1227315fefee0691b easyhg_v1.2
 9b300409c184d47d57fba49341b2a1818b7fd0bc easyhg_v1.2
 8bcf7ce9b1d209b94f71593545fc5de7c008f5a3 easyhg_v1.2_win32_2
+abfef4acceca78078fe0c3b7fa8794f9ec77a4d3 easyhg_v1.2.1
--- a/src/filestatuswidget.cpp	Tue Apr 24 16:55:26 2012 +0100
+++ b/src/filestatuswidget.cpp	Tue Apr 24 16:56:29 2012 +0100
@@ -79,7 +79,7 @@
                                              "They will not be deleted from the local folder.");
     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.");
+                                             "If you deleted them by accident, right-click them and use Revert to restore their previous contents.");
     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.");