Artifact
46f4753240a2b344c694ea448ffbd5406ddfeac2a0c8c0e2a8b77ca06fabb35f:
- File
test/set-manifest.test
-
2020-06-13 01:25:42
— part of check-in
[3c7825278b]
on branch trunk
— Remove superfluous 'then' from the test suite. Also, enhance -verbose when used for merge tests.
(user:
mistachkin
size: 5296)
-
2020-06-25 08:16:00
— part of check-in
[69b450c1e0]
on branch cleanX
— Merge trunk
(user:
jan.nijtmans
size: 5296)
-
2020-08-09 21:45:46
— part of check-in
[7cfbf66a02]
on branch cmake-ide
— Merge in trunk; resolve conflicts
(user:
ashepilko
size: 5296)
-
2020-08-26 13:31:58
— part of check-in
[62c316306e]
on branch wiki-history
— Merge in trunk (version-2.12.1)
(user:
george
size: 5296)
-
2021-02-14 21:28:19
— part of check-in
[0516f4d3c8]
on branch ui-local-diff
— Brought graham's ui-local-diff branch up to date with respect to trunk.
This is not a simple merge, because it had to accommodate several
conflicting changes, so it needs to be re-checked for sanity before
being merged down to trunk. Also, some of the changes I made simply
reduce the size of the resulting diff relative to trunk and need to be
reverted; these are primarily 2-line splits of "else/if" so the
branch-specific change doesn't repeat the following "if" condition,
which is now the "else if" condition. I think this sort of thing aids
understanding of the diff, even though it breaks the style guidelines.
(user:
wyoung
size: 5296)
-
2021-03-01 07:37:26
— part of check-in
[ea28708f85]
on branch artifact-view-links
— Merged trunk changes in. Only needed to track my own rename of
branch_of_rid() to branch_of_ckin_rid()
(user:
wyoung
size: 5296)
-
2022-10-17 01:02:29
— part of check-in
[6f3640a71d]
on branch th1Hash
— Merge updates from trunk.
(user:
mistachkin
size: 5296)