Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
src/eric7/Plugins/VcsPlugins/vcsMercurial/hg.py
- branch
- eric7
- changeset 10372
- 1444b4bee64b
- parent 10215
- d476667171a1
- child 10373
- 093dcebe5ecb
equal
deleted
inserted
replaced
| 10371:1f54843e8152 | 10372:1444b4bee64b |
|---|---|
| 1006 if names[0]: | 1006 if names[0]: |
| 1007 dlg = DeleteFilesConfirmationDialog( | 1007 dlg = DeleteFilesConfirmationDialog( |
| 1008 self.parent(), | 1008 self.parent(), |
| 1009 self.tr("Re-Merge"), | 1009 self.tr("Re-Merge"), |
| 1010 self.tr( | 1010 self.tr( |
| 1011 "Do you really want to re-merge these files" " or directories?" | 1011 "Do you really want to re-merge these files or directories?" |
| 1012 ), | 1012 ), |
| 1013 names, | 1013 names, |
| 1014 ) | 1014 ) |
| 1015 yes = dlg.exec() == QDialog.DialogCode.Accepted | 1015 yes = dlg.exec() == QDialog.DialogCode.Accepted |
| 1016 else: | 1016 else: |
