Mercurial > hg > easyhg
diff mainwindow.cpp @ 322:913d213dd427
Remove message about updating to bring changes into the working copy: it isn't always true (e.g. if you have to do a merge next)
author | Chris Cannam |
---|---|
date | Wed, 02 Mar 2011 16:29:17 +0000 |
parents | 124a3ea9fafb |
children | ef977e7482cd |
line wrap: on
line diff
--- a/mainwindow.cpp Wed Mar 02 16:28:03 2011 +0000 +++ b/mainwindow.cpp Wed Mar 02 16:29:17 2011 +0000 @@ -1667,7 +1667,7 @@ int n = extractChangeCount(output); if (n > 0) { head = tr("Pulled %n changeset(s)", "", n); - report = tr("The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy."); + report = tr("New changes will be highlighted in yellow in the history."); } else if (n == 0) { head = tr("No changes to pull"); report = tr("Your local repository already contains all changes found in the remote repository.");