Mercurial > hg
view tests/test-merge8 @ 9457:f3f400b13984
convert: disable SVN support due to library license incompatibility
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 23 Sep 2009 00:23:50 -0500 |
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