diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-05-17 14:38:33 -0700 |
commit | ef687dbd9da6e44ffcfeef3216b531d22d5e43d4 (patch) | |
tree | ada53bca0059d2fbf0def30272c6905b277b983a /Documentation/git-merge-base.txt | |
parent | Merge branch 'ls/travis-build-doc' (diff) | |
parent | wrap-for-bin.sh: regenerate bin-wrappers when switching branches (diff) | |
download | tgif-ef687dbd9da6e44ffcfeef3216b531d22d5e43d4.tar.xz |
Merge branch 'nd/test-helpers'
Switching between 'master' and 'next', between which the paths to
test helper binaries have changed, did not update bin-wrappers/*
scripts used in tests, causing false test failures.
* nd/test-helpers:
wrap-for-bin.sh: regenerate bin-wrappers when switching branches
Diffstat (limited to 'Documentation/git-merge-base.txt')
0 files changed, 0 insertions, 0 deletions