aboutsummaryrefslogtreecommitdiff
path: root/git-merge-one-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-10 17:02:56 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-10 17:02:56 +0900
commit1eb539a9b3ed2af95992bf9460bd77b4bc5fea23 (patch)
tree612c47006bf82c76850129f7e17ffe504a0f9711 /git-merge-one-file.sh
parentea8bf0009598ffa3305003d67514eafa49e14a25 (diff)
parentdff2813391d720e1739d1d83a84ba38b1d4ad615 (diff)
downloadgit-1eb539a9b3ed2af95992bf9460bd77b4bc5fea23.tar.gz
git-1eb539a9b3ed2af95992bf9460bd77b4bc5fea23.tar.xz
Merge branch 'ab/ref-filter-no-contains' into maint
A test fix. * ab/ref-filter-no-contains: tests: don't give unportable ">" to "test" built-in, use -gt
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions