Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 4562:d48e1b5f8265
patchbomb: 0c61124ad877 moved setremoteconfig into cmdutil
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Tue, 12 Jun 2007 14:39:36 -0700 |
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