Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py

branch
Py2 comp.
changeset 3057
10516539f238
parent 2525
8b507a9a2d40
parent 3008
7848489bcb92
child 3058
0a02c433f52d
--- a/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Tue Oct 15 22:03:54 2013 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py	Fri Oct 18 23:00:41 2013 +0200
@@ -43,10 +43,10 @@
         self.hgFetchAct.setWhatsThis(self.trUtf8(
             """<b>Fetch changes</b>"""
             """<p>This pulls changes from a remote repository into the """
-            """local repository. If the pulled changes add a new branch head,"""
-            """ the head is automatically merged, and the result of the merge"""
-            """ is committed. Otherwise, the working directory is updated to"""
-            """ include the new changes.</p>"""
+            """local repository. If the pulled changes add a new branch"""
+            """ head, the head is automatically merged, and the result of"""
+            """ the merge is committed. Otherwise, the working directory"""
+            """ is updated to include the new changes.</p>"""
         ))
         self.hgFetchAct.triggered[()].connect(self.__hgFetch)
         self.actions.append(self.hgFetchAct)

eric ide

mercurial