about summary refs log tree commit diff
path: root/third_party/git/merge.c
diff options
context:
space:
mode:
authorGriffin Smith <grfn@gws.fyi>2020-08-28T22·19-0400
committerglittershark <grfn@gws.fyi>2020-08-28T22·32+0000
commit13088392e2fbb358b00fb5f6a3b9c16928d70a97 (patch)
tree71cd7339ffd8958ed6ef268abd73edda41d2957a /third_party/git/merge.c
parent74a6a9c8179b8b342b927678f12f825a91d00d04 (diff)
fix(gs/emacs): Load slack after defining color vars r/1732
Change-Id: Ife6164bd4b4d68f82a01d34354c19c1a90c943ff
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1870
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/git/merge.c')
0 files changed, 0 insertions, 0 deletions