Skip to content

N
neo
Commit 60125d35 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent 6ddb3bf6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
go/xcommon/xcontext/xcontext.go
View file @ 60125d35
...@@ -29,6 +29,7 @@ import ( ...@@ -29,6 +29,7 @@ import (
// Merge merges 2 contexts into 1. // Merge merges 2 contexts into 1.
// //
// The result context: // The result context:
//
// - is done when ctx1 or ctx2 is done, or cancel called, whichever happens first, // - is done when ctx1 or ctx2 is done, or cancel called, whichever happens first,
// - has deadline = min(ctx1.Deadline, ctx2.Deadline), // - has deadline = min(ctx1.Deadline, ctx2.Deadline),
// - has associated values merged from ctx1 and ctx2. // - has associated values merged from ctx1 and ctx2.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7