diff options
| author | Cynthia Revström <me@cynthia.re> | 2020-10-05T12·55+0200 |
|---|---|---|
| committer | cynthia <cynthia@tvl.fyi> | 2020-10-05T13·00+0000 |
| commit | df6a1d47d2a9e4a5ecfbf58798c4d3c341bfc191 (patch) | |
| tree | 730639fbfd15149427b6793b07affacc4c579ccc /third_party/git/Documentation/git-merge.txt | |
| parent | 7a62272d20ab18fc8c60c2cef83fd2a06f1692a6 (diff) | |
chore(tvl-slapd): use ARGON2 for cynthia r/1834
Change-Id: I81efffe384644cc2d2a625fc96ef5264dedd76ea Reviewed-on: https://cl.tvl.fyi/c/depot/+/2019 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/git/Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions