Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 5467:521284cdbcb4
mercurial.el: mark-marker() returns non-nil with no active mark on GNU Emacs
author | NIIMI Satoshi <sa2c@sa2c.net> |
---|---|
date | Thu, 11 Oct 2007 06:10:45 +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