Mercurial > hg
view tests/test-conflict @ 10954:33119d0252c1 stable
subrepo: fix repo root path handling in svn subrepo
author | Brett Cannon <brett@python.org> |
---|---|
date | Sun, 18 Apr 2010 14:20:08 -0700 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status