Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- changeset 3306
- 0a4e5082cbc6
- parent 2387
- 2d119e79ab54
equal
deleted
inserted
replaced
| 3305:cf4f22a19dc6 | 3306:0a4e5082cbc6 |
|---|---|
| 95 <table> | 95 <table> |
| 96 <tr><td>None</td></tr> | 96 <tr><td>None</td></tr> |
| 97 </table> | 97 </table> |
| 98 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> | 98 <a NAME="HgMergeDialog.__init__" ID="HgMergeDialog.__init__"></a> |
| 99 <h4>HgMergeDialog (Constructor)</h4> | 99 <h4>HgMergeDialog (Constructor)</h4> |
| 100 <b>HgMergeDialog</b>(<i>force, tagsList, branchesList, bookmarksList=None, parent=None</i>) | 100 <b>HgMergeDialog</b>(<i>tagsList, branchesList, bookmarksList=None, parent=None</i>) |
| 101 <p> | 101 <p> |
| 102 Constructor | 102 Constructor |
| 103 </p><dl> | 103 </p><dl> |
| 104 <dt><i>force</i></dt> | 104 <dt><i>tagsList</i></dt> |
| 105 <dd> | |
| 106 flag indicating a forced merge (boolean) | |
| 107 </dd><dt><i>tagsList</i></dt> | |
| 108 <dd> | 105 <dd> |
| 109 list of tags (list of strings) | 106 list of tags (list of strings) |
| 110 </dd><dt><i>branchesList</i></dt> | 107 </dd><dt><i>branchesList</i></dt> |
| 111 <dd> | 108 <dd> |
| 112 list of branches (list of strings) | 109 list of branches (list of strings) |
