Mercurial > hg
view tests/test-merge8 @ 10556:9bd0bd785696 stable
i18n-da: synchronized with 091dddf05764
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Sun, 28 Feb 2010 18:02:20 +0100 |
parents | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/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