diff options
| author | John Ericson <git@JohnEricson.me> | 2019-10-26T09·16-0400 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-17T14·56+0100 |
| commit | 9c21176f5779d5757cfc38497873bb0e13eb4f0b (patch) | |
| tree | 9f8d580cd1bae8cd079dcc9e0e5434abf87f350d /third_party/git/git-merge-resolve.sh | |
| parent | 3f6f3356e86c5f48955dcf55cfbb1bf42456533a (diff) | |
chore(3p/nix): Make libsodium an auto dependency r/734
This means do autodetection if the user doesn't specify. (cherry picked from commit 1be6ab4d3eb4d6b04c322b9ed0a108c2b5354ec5)
Diffstat (limited to 'third_party/git/git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions