Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge4 @ 4884:72ac66e88c43
convert: Use clone's behaviour for the default destionation name.
Adjusted the documentation for this and for the fact that the destionation is
created even if a name is specified.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Sun, 15 Jul 2007 21:04:07 +0200 |
parents | e506c14382fd |
children |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"