about summary refs log tree commit diff
path: root/third_party/git/git-merge-resolve.sh
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2021-09-15T14·15+0300
committertazjin <mail@tazj.in>2021-09-16T01·19+0000
commit6cfee7ef5a0062453e7ea040d065da06f61f1aed (patch)
treee97e9a1378c182983687c0b8134f8702bc8009d3 /third_party/git/git-merge-resolve.sh
parent2be5ed1d4a7d6f92111ec26d6b8233fde815e72c (diff)
chore(3p/josh): Bump version to latest master r/2873
Change-Id: I01b58653a9d0067deb9644ecfa4d4b3bd75185a9
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3557
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'third_party/git/git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions