diff -r 0bb5b5e2e219 -r 4d421fed3b64 Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
--- 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)
