diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-21 15:14:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-21 15:14:23 -0700 |
| commit | 964a856cbea37a9b059f273aaed6925c95e4ee5d (patch) | |
| tree | ce05430e4e2f3e9c549d763f6eeab2f4bd95bc66 /git-merge-resolve.sh | |
| parent | 74cc1aa55f30ed76424a0e7226ab519aa6265061 (diff) | |
| parent | eed36fce38c406b548d53c56483e1d2e25c5c971 (diff) | |
Merge branch 'sm/no-git-in-upstream-of-pipe-in-tests'
Test fixes.
* sm/no-git-in-upstream-of-pipe-in-tests:
t0030-t0050: avoid pipes with Git on LHS
t0001-t0028: avoid pipes with Git on LHS
t0003: avoid pipes with Git on LHS
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions