about summary refs log tree commit diff
path: root/third_party/git/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-06-29T00·38-0400
committerglittershark <grfn@gws.fyi>2020-06-29T00·38+0000
commit1397cbce522d8b0876e1854848b650980211c8c4 (patch)
tree79a09b860ed9c0b8442f1fe128108ee0b6ddd1d0 /third_party/git/git-mergetool--lib.sh
parent6cd8b8e7e8e68e69acb0ea2fa0578c9146c1632f (diff)
fix(xan): Disable comonad-extras r/1121
Turns out we don't actually need this, and the patch for it doesn't
cleanly apply anymore

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