aboutsummaryrefslogtreecommitdiffstats
path: root/userdiff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-22 14:41:26 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-22 14:41:26 -0800
commit48e0ad033ffd009df1283858ac70ac53660e2d7c (patch)
treed8da9c9de20df434b1962b09ad59ff9ee04d7658 /userdiff.c
parentMerge branch 'jc/maint-am-abort-safely' (diff)
parentt9501-*.sh: Fix a test failure on Cygwin (diff)
downloadgit-48e0ad033ffd009df1283858ac70ac53660e2d7c.tar.gz
git-48e0ad033ffd009df1283858ac70ac53660e2d7c.zip
Merge branch 'rj/maint-test-fixes'
* rj/maint-test-fixes: t9501-*.sh: Fix a test failure on Cygwin lib-git-svn.sh: Add check for mis-configured web server variables lib-git-svn.sh: Avoid setting web server variables unnecessarily t9142: Move call to start_httpd into the setup test t3600-rm.sh: Don't pass a non-existent prereq to test #15
Diffstat (limited to 'userdiff.c')
0 files changed, 0 insertions, 0 deletions