Mercurial Repositories > eric / file comparison
comparison: eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
eric6/Documentation/Source/eric6.Plugins.VcsPlugins.vcsGit.GitMergeDialog.html
- changeset 7989
- a21d673a8f99
- parent 7273
- 391d6b7b1eff
equal
deleted
inserted
replaced
| 7988:c4c17121eff8 | 7989:a21d673a8f99 |
|---|---|
| 186 | 186 |
| 187 <p> | 187 <p> |
| 188 Public method to retrieve the merge data. | 188 Public method to retrieve the merge data. |
| 189 </p> | 189 </p> |
| 190 <dl> | 190 <dl> |
| 191 <dt>Returns:</dt> | 191 <dt>Return:</dt> |
| 192 <dd> | 192 <dd> |
| 193 tuple naming the revision, a flag indicating that the merge | 193 tuple naming the revision, a flag indicating that the merge |
| 194 shall be committed, the commit message, a flag indicating that a | 194 shall be committed, the commit message, a flag indicating that a |
| 195 log summary shall be appended and a flag indicating to show diff | 195 log summary shall be appended and a flag indicating to show diff |
| 196 statistics at the end of the merge (string, boolean, string, | 196 statistics at the end of the merge (string, boolean, string, |
