summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKlaus Aehlig <klaus.aehlig@huawei.com>2025-02-19 15:46:16 +0100
committerKlaus Aehlig <klaus.aehlig@huawei.com>2025-03-10 16:28:59 +0100
commita0db78bd86a21fa072e28fa6dfd0fc53fd72a652 (patch)
tree4b4be2f8bdb12403b2979f10b20f4d748eb9832e /src
parentd53358c350898091d9cf2ba76ccdfa9e590275ee (diff)
downloadjustbuild-a0db78bd86a21fa072e28fa6dfd0fc53fd72a652.tar.gz
rc merging: invocation log is merged locally
Diffstat (limited to 'src')
-rw-r--r--src/other_tools/just_mr/rc_merge.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/other_tools/just_mr/rc_merge.cpp b/src/other_tools/just_mr/rc_merge.cpp
index dfd90b54..173b8a9e 100644
--- a/src/other_tools/just_mr/rc_merge.cpp
+++ b/src/other_tools/just_mr/rc_merge.cpp
@@ -25,7 +25,8 @@
namespace {
auto const kAccumulating = std::vector<std::string>{"distdirs"};
-auto const kLocalMerge = std::vector<std::string>{"just args", "just files"};
+auto const kLocalMerge =
+ std::vector<std::string>{"just args", "just files", "invocation log"};
} // namespace