Mercurial > hg > pyhgsh
view tests/test-conflict @ 2095:0bf2a9e5eff1
Don't send "Content-Type: none"
mimetypes.guess_type will return (None, None) when it can't detect the
filetype.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 19 Apr 2006 11:41:22 -0700 |
parents | 7544700fd931 |
children | e506c14382fd |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" HGMERGE=merge; export HGMERGE hg up -m 1 hg id egrep -v ">>>|<<<" a hg status