Commit 36279f9
committed
Merge branch 'develop' into release/v3.1.11
# Conflicts:
# docs/about/authors.md
# docs/about/license.md
# docs/about/project-details.md
# docs/about/support.md
# docs/index.md
# docs/userguide/advanced_data_comparison.md
# docs/userguide/annotations.md
# docs/userguide/best-practices.md
# docs/userguide/coverage.md
# docs/userguide/exception-reporting.md
# docs/userguide/expectations.md
# docs/userguide/getting-started.md
# docs/userguide/install.md
# docs/userguide/querying_suites.md
# docs/userguide/reporters.md
# docs/userguide/running-unit-tests.md
# docs/userguide/upgrade.md
# source/core/ut_utils.pkb
# source/core/ut_utils.pks5 files changed
Lines changed: 9 additions & 9 deletions
File tree
- source
- reporters
- test/ut3_user/reporters/test_coverage
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
168 | | - | |
169 | | - | |
170 | | - | |
171 | 168 | | |
172 | 169 | | |
173 | 170 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
79 | 79 | | |
80 | 80 | | |
81 | 81 | | |
82 | | - | |
| 82 | + | |
83 | 83 | | |
84 | 84 | | |
| 85 | + | |
85 | 86 | | |
86 | 87 | | |
87 | 88 | | |
| |||
90 | 91 | | |
91 | 92 | | |
92 | 93 | | |
93 | | - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
94 | 97 | | |
95 | | - | |
| 98 | + | |
96 | 99 | | |
97 | 100 | | |
98 | 101 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
164 | 164 | | |
165 | 165 | | |
166 | 166 | | |
167 | | - | |
| 167 | + | |
168 | 168 | | |
169 | 169 | | |
170 | 170 | | |
| |||
0 commit comments