Mercurial > hg
view tests/test-conflict @ 5911:2296ecefa223
Fix test-strip-cross on Solaris
Solaris /sbin/sh doesn't do brace expansion
author | Richard Lowe <richlowe@richlowe.net> |
---|---|
date | Sat, 19 Jan 2008 22:16:15 -0500 |
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