Mercurial > hg
view tests/test-conflict @ 8313:b695392491e7
commit: be more verbose in the -u help text
Make the requirement of an argument for -u a little more explicit.
author | Sverre Rabbelier <sverre@rabbelier.nl> |
---|---|
date | Fri, 08 May 2009 16:30:51 +0200 |
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