about summary refs log tree commit diff
path: root/third_party/git/merge-recursive.h
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-06-19T18·29-0400
committerglittershark <grfn@gws.fyi>2020-06-19T18·29+0000
commitff77481367dddc5852191e3a4614250cca4f6f2c (patch)
tree26a957258ee28458c5317c74ca0a858ad6e5dc8d /third_party/git/merge-recursive.h
parent56d86da4e980348c894e1c6ef57fb96ff0fbd6dc (diff)
feat(gs/emacs): actually require tvl r/1042
Change-Id: Iba79c85ebc87c6df13d69781255b3f6645233c2c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/506
Reviewed-by: glittershark <grfn@gws.fyi>
Diffstat (limited to 'third_party/git/merge-recursive.h')
0 files changed, 0 insertions, 0 deletions