Mercurial > hg
view tests/test-conflict @ 11760:46039b2af349
zsh completions: add qpush --move option
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 07 Aug 2010 15:32:33 +0900 |
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