Remove empty directories on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Remove empty directories on update
manifest hash: 113969ec14c75eb9e1013b23cf096f722932b84d
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyVoywK+sNU5EO8RAklKAKCzSUhuFClkHN85qlnDp5iVscZbtgCeJVwx
dqaqG20GjPMWBg0d1ggI/ro=
=o2Uv
-----END PGP SIGNATURE-----
#!/bin/sh
set -x
hg init
echo "nothing" > a
hg add a
hg commit -t ancestor -u test -d "0 0"
echo "something" > a
hg commit -t branch1 -u test -d "0 0"
hg co 0
echo "something else" > a
hg commit -t branch2 -u test -d "0 0"
export HGMERGE=merge
hg -d up -m 1
hg id
grep -Ev ">>>|<<<" a
hg status