--- a/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.py Fri Oct 18 23:00:41 2013 +0200 @@ -19,7 +19,8 @@ """ Class implementing a dialog to enter the data for a merge operation. """ - def __init__(self, force, tagsList, branchesList, bookmarksList=None, parent=None): + def __init__(self, force, tagsList, branchesList, bookmarksList=None, + parent=None): """ Constructor