about summary refs log tree commit diff
path: root/third_party/git/git-mergetool.sh
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-08-15T16·50+0200
committersterni <sternenseemann@systemli.org>2021-08-15T23·26+0000
commit0bf5b9eb20e9bdf8581132e5ebefa30f5961ae6a (patch)
tree8fb247c179015d3823eeae58784b66124c8e1eae /third_party/git/git-mergetool.sh
parentda09725c30c0085a33cd71e06c5333ad39d6c528 (diff)
feat(3p/lisp/nibbles): 2017-03-07 -> 2021-05-20 r/2740
Also allows us to enable the SBCL opt modules. Upstream changes as
sharplispers has the only maintained nibbles fork atm.

Change-Id: I6f0d1b9e4e570169e5f5c584364948e2031063af
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3364
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Diffstat (limited to 'third_party/git/git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions