Mon, 05 Apr 2010 16:38:53 +0000
Corrected some source docu.
Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py | file | annotate | diff | comparison | revisions | |
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Mon Apr 05 11:08:19 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnMergeDialog.py Mon Apr 05 16:38:53 2010 +0000 @@ -74,7 +74,7 @@ def getParameters(self): """ - Public method to retrieve the tag data. + Public method to retrieve the merge data. @return tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Mon Apr 05 11:08:19 2010 +0000 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Mon Apr 05 16:38:53 2010 +0000 @@ -74,7 +74,7 @@ def getParameters(self): """ - Public method to retrieve the tag data. + Public method to retrieve the merge data. @return tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean)