Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
eric6/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py
- changeset 7923
- 91e843545d9a
- parent 7771
- 787a6b3f8c9f
- child 7970
- c4ee8a81584c
equal
deleted
inserted
replaced
| 7921:0d429bd82699 | 7923:91e843545d9a |
|---|---|
| 1 # -*- coding: utf-8 -*- | 1 # -*- coding: utf-8 -*- |
| 2 | 2 |
| 3 # Copyright (c) 2014 - 2020 Detlev Offenbach <detlev@die-offenbachs.de> | 3 # Copyright (c) 2014 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> |
| 4 # | 4 # |
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Module implementing a dialog to show a list of files which had or still have | 7 Module implementing a dialog to show a list of files which had or still have |
| 8 conflicts. | 8 conflicts. |
