Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsMercurial.HgMergeDialog.html
- branch
- maintenance
- changeset 8043
- 0acf98cd089a
- parent 7989
- a21d673a8f99
equal
deleted
inserted
replaced
| 7991:866adc8c315b | 8043:0acf98cd089a |
|---|---|
| 158 | 158 |
| 159 <p> | 159 <p> |
| 160 Public method to retrieve the merge data. | 160 Public method to retrieve the merge data. |
| 161 </p> | 161 </p> |
| 162 <dl> | 162 <dl> |
| 163 <dt>Returns:</dt> | 163 <dt>Return:</dt> |
| 164 <dd> | 164 <dd> |
| 165 tuple naming the revision and a flag indicating a | 165 tuple naming the revision and a flag indicating a |
| 166 forced merge (string, boolean) | 166 forced merge (string, boolean) |
| 167 </dd> | 167 </dd> |
| 168 </dl> | 168 </dl> |
