Various doc clean-ups and spelling fixes
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Various doc clean-ups and spelling fixes
manifest hash: 4115506709314aabfb4a66973ef2bc8f22f2225b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCwQ5YywK+sNU5EO8RAkAlAJoCsXCgEQ1lmS58aSrUyPf+KIK99gCeLY/v
Tg9JhygJjwsu5xocc9Nh04Y=
=JTG4
-----END PGP SIGNATURE-----
#!/bin/bash
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