about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-01-05T16·10-0500
committerclbot <clbot@tvl.fyi>2024-01-05T16·30+0000
commite66dcba19549a0a108f93b17feafb8084a1e67a1 (patch)
tree1a4eac73dc8f46f903072837126903cec17b5d3a /third_party/git/Documentation/git-merge.txt
parent5154406ca8030f4fed944be4b00a8cd4c18dc2d8 (diff)
fix(tvix/eval): Update eval benches for new API r/7344
cl/10475 updated the API of tvix_eval::Evaluation, but didn't update
this benchmark to use that new API.

Also, fixes the docstring to no longer specify that there is a "given
snippet".

Change-Id: Ibb8285731849dbeec814e2585bbaa36f22368afe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10542
Autosubmit: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'third_party/git/Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions