about summary refs log tree commit diff
path: root/third_party/git/t/t6047-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-30T22·11+0100
committerVincent Ambo <tazjin@google.com>2020-05-30T22·17+0100
commit699ab4e20a252c649339831e7c1b8a028d9fd8e8 (patch)
treebb763cf0c51e9fe295c3fd1be56ef8c925ca2902 /third_party/git/t/t6047-diff3-conflict-markers.sh
parent91ddc7603d2fa2b59299375adc8a245558a9e811 (diff)
chore(3p/nix): Clean up some unused defines r/872
Diffstat (limited to 'third_party/git/t/t6047-diff3-conflict-markers.sh')
0 files changed, 0 insertions, 0 deletions