about summary refs log tree commit diff
path: root/third_party/git/git-mergetool.sh
diff options
context:
space:
mode:
authorLuke Granger-Brown <hg@lukegb.com>2020-07-06T23·05+0000
committerlukegb <lukegb@tvl.fyi>2020-07-06T23·08+0000
commitcb52c9e41d87303d36b15efa4819c2fe47ff13b3 (patch)
treef231a3698c8460ef9c1547430a0bfe300ef1b5cd /third_party/git/git-mergetool.sh
parent1e8dbd5b1b7b58e55871af77d1900996c2f69bba (diff)
chore(ops/nixos/tvl-sso): add secrets r/1236
Change-Id: I29f5e762852593f05b9936d5635aadcc7eba2840
Reviewed-on: https://cl.tvl.fyi/c/depot/+/951
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party/git/git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions