--- a/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Sat Jan 16 16:50:00 2021 +0100 +++ b/eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html Sat Jan 16 16:51:23 2021 +0100 @@ -160,7 +160,7 @@ Public method to retrieve the merge data. </p> <dl> -<dt>Returns:</dt> +<dt>Return:</dt> <dd> tuple naming the revision and a flag indicating a forced merge (string, boolean)