summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-10 20:02:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-10 20:02:22 (GMT)
commitb92cbb62def240268c1af39f1a688fec8d34ac9b (patch)
tree40076d09750cf1cf357d21794f152f3e519da32e /t/t3507-cherry-pick-conflict.sh
parent055e1e29696c0fb06582c1592ee6b58643dcc514 (diff)
parente3918594f6269b37ad7bd7e419df433b6d586428 (diff)
downloadgit-b92cbb62def240268c1af39f1a688fec8d34ac9b.zip
git-b92cbb62def240268c1af39f1a688fec8d34ac9b.tar.gz
git-b92cbb62def240268c1af39f1a688fec8d34ac9b.tar.bz2
Merge branch 'mr/gitweb-jsmin'
* mr/gitweb-jsmin: gitweb: update INSTALL to use shorter make target gitweb: add documentation to INSTALL regarding gitweb.js instaweb: add minification awareness Gitweb: add autoconfigure support for minifiers Gitweb: add support for minifying gitweb.css Gitweb: add ignore and clean rules for minified files
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions