Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.hg.html
- branch
- 5_5_x
- changeset 3899
- d7c695edb611
- parent 3591
- 2f2a4a76dd22
equal
deleted
inserted
replaced
| 3896:5915df11b95e | 3899:d7c695edb611 |
|---|---|
| 175 </tr><tr> | 175 </tr><tr> |
| 176 <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> | 176 <td><a href="#Hg.hgCancelMerge">hgCancelMerge</a></td> |
| 177 <td>Public method to cancel an uncommitted merge.</td> | 177 <td>Public method to cancel an uncommitted merge.</td> |
| 178 </tr><tr> | 178 </tr><tr> |
| 179 <td><a href="#Hg.hgConflicts">hgConflicts</a></td> | 179 <td><a href="#Hg.hgConflicts">hgConflicts</a></td> |
| 180 <td>Public method used to show a list of files containing.</td> | 180 <td>Public method used to show a list of files containing conflicts.</td> |
| 181 </tr><tr> | 181 </tr><tr> |
| 182 <td><a href="#Hg.hgCopy">hgCopy</a></td> | 182 <td><a href="#Hg.hgCopy">hgCopy</a></td> |
| 183 <td>Public method used to copy a file/directory.</td> | 183 <td>Public method used to copy a file/directory.</td> |
| 184 </tr><tr> | 184 </tr><tr> |
| 185 <td><a href="#Hg.hgCreateIgnoreFile">hgCreateIgnoreFile</a></td> | 185 <td><a href="#Hg.hgCreateIgnoreFile">hgCreateIgnoreFile</a></td> |
| 274 </tr><tr> | 274 </tr><tr> |
| 275 <td><a href="#Hg.hgServe">hgServe</a></td> | 275 <td><a href="#Hg.hgServe">hgServe</a></td> |
| 276 <td>Public method used to serve the project.</td> | 276 <td>Public method used to serve the project.</td> |
| 277 </tr><tr> | 277 </tr><tr> |
| 278 <td><a href="#Hg.hgShowBranch">hgShowBranch</a></td> | 278 <td><a href="#Hg.hgShowBranch">hgShowBranch</a></td> |
| 279 <td>Public method used to show the current branch the working directory.</td> | 279 <td>Public method used to show the current branch of the working directory.</td> |
| 280 </tr><tr> | 280 </tr><tr> |
| 281 <td><a href="#Hg.hgShowConfig">hgShowConfig</a></td> | 281 <td><a href="#Hg.hgShowConfig">hgShowConfig</a></td> |
| 282 <td>Public method to show the combined configuration.</td> | 282 <td>Public method to show the combined configuration.</td> |
| 283 </tr><tr> | 283 </tr><tr> |
| 284 <td><a href="#Hg.hgShowPaths">hgShowPaths</a></td> | 284 <td><a href="#Hg.hgShowPaths">hgShowPaths</a></td> |
| 787 </dd> | 787 </dd> |
| 788 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> | 788 </dl><a NAME="Hg.hgConflicts" ID="Hg.hgConflicts"></a> |
| 789 <h4>Hg.hgConflicts</h4> | 789 <h4>Hg.hgConflicts</h4> |
| 790 <b>hgConflicts</b>(<i>name</i>) | 790 <b>hgConflicts</b>(<i>name</i>) |
| 791 <p> | 791 <p> |
| 792 Public method used to show a list of files containing. | 792 Public method used to show a list of files containing conflicts. |
| 793 </p><dl> | 793 </p><dl> |
| 794 <dt><i>name</i></dt> | 794 <dt><i>name</i></dt> |
| 795 <dd> | 795 <dd> |
| 796 file/directory name to be resolved (string) | 796 file/directory name to be resolved (string) |
| 797 </dd> | 797 </dd> |
| 1246 </dd> | 1246 </dd> |
| 1247 </dl><a NAME="Hg.hgShowBranch" ID="Hg.hgShowBranch"></a> | 1247 </dl><a NAME="Hg.hgShowBranch" ID="Hg.hgShowBranch"></a> |
| 1248 <h4>Hg.hgShowBranch</h4> | 1248 <h4>Hg.hgShowBranch</h4> |
| 1249 <b>hgShowBranch</b>(<i>name</i>) | 1249 <b>hgShowBranch</b>(<i>name</i>) |
| 1250 <p> | 1250 <p> |
| 1251 Public method used to show the current branch the working directory. | 1251 Public method used to show the current branch of the working directory. |
| 1252 </p><dl> | 1252 </p><dl> |
| 1253 <dt><i>name</i></dt> | 1253 <dt><i>name</i></dt> |
| 1254 <dd> | 1254 <dd> |
| 1255 file/directory name (string) | 1255 file/directory name (string) |
| 1256 </dd> | 1256 </dd> |
