about summary refs log tree commit diff
path: root/third_party/git/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-05-23T00·08+0100
committerVincent Ambo <tazjin@google.com>2020-05-23T00·09+0100
commit92792264f78ce95c08fdd802110ddad7956c0758 (patch)
tree007ed74325d696ec9f969f4a97f4cc823f53ab87 /third_party/git/Documentation/merge-strategies.txt
parent6b447f4b259e929faf0add0cf0ad36309a7ec13d (diff)
chore(3p/nix/libexpr): Remove unused __overrides feature r/819
This feature does not appear in nixpkgs, so I don't care about it. My
only goal is evaluating nixpkgs.
Diffstat (limited to 'third_party/git/Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions