Mercurial > hg
view tests/test-merge8 @ 6668:034f444902d9
mq: qdiff: support all diffopts
author | Jason Orendorff <jorendorff@mozilla.com> |
---|---|
date | Thu, 12 Jun 2008 07:38:15 -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