t / lib-httpd / error-smart-http.shon commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1echo "Content-Type: application/x-git-upload-pack-advertisement"
   2echo
   3printf "%s" "0019ERR server-side error"