view tests/test-merge8 @ 8757:f835b8a7eeed

i18n-pt_BR: synchronized and updated

- synchronized with hg 6019e6517f95
- translated remaining messages
- many spelling and formatting fixes

#!/bin/sh

# Test for changeset ba7c74081861
# (update dirstate correctly for non-branchmerge updates)
hg init a
cd a
echo a > a
hg add a
hg commit -m a
cd ..
hg clone a b
cd a
hg mv a b
hg commit -m move
echo b >> b
hg commit -m b
cd ../b
hg pull ../a
hg update