Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- changeset 945
- 8cd4d08fa9f6
- parent 440
- 69ace3e2dcf6
- child 1020
- adf7e95f05e7
equal
deleted
inserted
replaced
| 944:1b59c4ba121e | 945:8cd4d08fa9f6 |
|---|---|
| 61 <td>Public method to retrieve the merge data.</td> | 61 <td>Public method to retrieve the merge data.</td> |
| 62 </tr> | 62 </tr> |
| 63 </table> | 63 </table> |
| 64 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> | 64 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> |
| 65 <h4>HgMergeDialog (Constructor)</h4> | 65 <h4>HgMergeDialog (Constructor)</h4> |
| 66 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent = None</i>) | 66 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, parent=None</i>) |
| 67 <p> | 67 <p> |
| 68 Constructor | 68 Constructor |
| 69 </p><dl> | 69 </p><dl> |
| 70 <dt><i>force</i></dt> | 70 <dt><i>force</i></dt> |
| 71 <dd> | 71 <dd> |
