diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-08-23 14:13:13 -0700 |
commit | 45121b9e302bb8640482c2add01fb6cfb1681534 (patch) | |
tree | a67d53fc4b319259d3a181a7b3669cd6447a6f54 /builtin/merge-tree.c | |
parent | Merge branch 'as/grep-quiet-no-match-exit-code-fix' (diff) | |
parent | t5526: fix some broken && chains (diff) | |
download | tgif-45121b9e302bb8640482c2add01fb6cfb1681534.tar.xz |
Merge branch 'hv/t5526-andand-chain-fix'
Test fix.
* hv/t5526-andand-chain-fix:
t5526: fix some broken && chains
Diffstat (limited to 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions