| 135 | Q_GLOBAL_STATIC_WITH_ARGS(const QRegularExpression, CONFLICT_RE, (QLatin1String("(^>>>>>>>)|(^=======)|(^<<<<<<<)"))) |
| 136 | |
| 137 | static QString formatRange(uint start, uint count) |
| 138 | { |
| 139 | if (count == 1) |
| 140 | return QString().setNum(start); |
| 141 | return QString().setNum(start) + u',' + QString().setNum(count); |
| 142 | } |
| 143 | |
| 144 | DiffRange parseRange(const QString &range) |
| 145 | { |