tests/test-conflict

One too many newlines in verbose output showed up in regression

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

One too many newlines in verbose output showed up in regression

manifest hash: 184bd0353358ec24c3711420ba3c6745a688ebc9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCsMC9ywK+sNU5EO8RAuYsAJ4wCphPRGI5omFy0VkbiQp8OairRwCcDdD2
pAR58+i+urS7MlbaDisCYUM=
=Ty7w
-----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
cat a | grep -v ">>>" | grep -v "<<<"
hg status