Mercurial > hg-stable
view tests/test-conflict @ 7297:bd6deb7525f4
mq: use cmdutil.matchfiles instead of match for qnew -f.
Closes issue1368.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 30 Oct 2008 12:38:24 -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