Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsSubversion.SvnMergeDialog.html
- changeset 7989
- a21d673a8f99
- parent 7273
- 391d6b7b1eff
equal
deleted
inserted
replaced
| 7988:c4c17121eff8 | 7989:a21d673a8f99 |
|---|---|
| 140 | 140 |
| 141 <p> | 141 <p> |
| 142 Public method to retrieve the merge data. | 142 Public method to retrieve the merge data. |
| 143 </p> | 143 </p> |
| 144 <dl> | 144 <dl> |
| 145 <dt>Returns:</dt> | 145 <dt>Return:</dt> |
| 146 <dd> | 146 <dd> |
| 147 tuple naming two tag names or two revisions, a target and | 147 tuple naming two tag names or two revisions, a target and |
| 148 a flag indicating a forced merge (string, string, string, boolean) | 148 a flag indicating a forced merge (string, string, string, boolean) |
| 149 </dd> | 149 </dd> |
| 150 </dl> | 150 </dl> |
