summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-08 12:36:23 -0800
committerJunio C Hamano <gitster@pobox.com>2018-03-08 12:36:23 -0800
commitc710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8 (patch)
tree7a99759b9628f9391c13683f354e7cedf88c292b /merge.c
parentc6284da4ff4afbde8211efe5d03f3604b1c6b9d6 (diff)
parent3c93b82920506a62ebdf3b6453d91b44aae0be97 (diff)
downloadgit-c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8.tar.gz
Merge branch 'sg/travis-build-during-script-phase'
Build the executable in 'script' phase in Travis CI integration, to follow the established practice, rather than during 'before_script' phase. This allows the CI categorize the failures better ('failed' is project's fault, 'errored' is build environment's). * sg/travis-build-during-script-phase: travis-ci: build Git during the 'script' phase
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions