Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
Plugins/VcsPlugins/vcsSubversion/SvnMergeDialog.py
- changeset 6048
- 82ad8ec9548c
- parent 5389
- 9b1c800daff3
- child 6645
- ad476851d7e0
equal
deleted
inserted
replaced
| 6047:39586a2de99d | 6048:82ad8ec9548c |
|---|---|
| 1 # -*- coding: utf-8 -*- | 1 # -*- coding: utf-8 -*- |
| 2 | 2 |
| 3 # Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de> | 3 # Copyright (c) 2003 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> |
| 4 # | 4 # |
| 5 | 5 |
| 6 """ | 6 """ |
| 7 Module implementing a dialog to enter the data for a merge operation. | 7 Module implementing a dialog to enter the data for a merge operation. |
| 8 """ | 8 """ |
