windows: hoist expand_glob() back into util.py
The windows version of expand_glob() requires patkind(). To
avoid a circular dependency, move function back into util.py.
#!/bin/sh
mkdir t
cd t
hg init
echo a > a
hg ci -Ama -d '1000000000 0'
echo b > b
hg branch b
hg ci -Amb -d '1000000000 0'
hg co -C 0
echo fast-forward
hg merge b
hg ci -Ammerge -d '1000000000 0'
echo bogus fast-forward should fail
hg merge b
echo done