diff -r 7848489bcb92 -r bf5ae5d7477d Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
--- a/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Oct 12 15:01:28 2013 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py Sat Oct 12 17:31:40 2013 +0200
@@ -17,12 +17,15 @@
"""
Class implementing a dialog to enter the data for a merge operation.
"""
- def __init__(self, mergelist1, mergelist2, targetlist, force=False, parent=None):
+ def __init__(self, mergelist1, mergelist2, targetlist, force=False,
+ parent=None):
"""
Constructor
- @param mergelist1 list of previously entered URLs/revisions (list of strings)
- @param mergelist2 list of previously entered URLs/revisions (list of strings)
+ @param mergelist1 list of previously entered URLs/revisions
+ (list of strings)
+ @param mergelist2 list of previously entered URLs/revisions
+ (list of strings)
@param targetlist list of previously entered targets (list of strings)
@param force flag indicating a forced merge (boolean)
@param parent parent widget (QWidget)
