summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-14 22:23:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-14 22:23:17 (GMT)
commit7c3b2034eda6cda3ef88dc4372da767b76e38bc9 (patch)
tree23ad3d7c5b2e3f769a32348182257cfdda8e337f /builtin/merge.c
parentd6db3f216544d05e09159756812ccbcb16861d71 (diff)
parentc6507484a2a87e53a5f0c4c01944192047bbeaa9 (diff)
downloadgit-7c3b2034eda6cda3ef88dc4372da767b76e38bc9.zip
git-7c3b2034eda6cda3ef88dc4372da767b76e38bc9.tar.gz
git-7c3b2034eda6cda3ef88dc4372da767b76e38bc9.tar.bz2
Merge branch 'ab/cond-skip-tests'
A few tests were run conditionally under (rare) conditions where they cannot be run (like running cvs tests under 'root' account). * ab/cond-skip-tests: gitweb tests: skip tests when we don't have Time::HiRes gitweb tests: change confusing "skip_all" phrasing cvs tests: skip tests that call "cvs commit" when running as root
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions