Mercurial > hg
view tests/test-conflict @ 10503:bbf22812e8ad stable
contrib/wix: MSVC CRT libraries are installed in WinSxS
not in %system32%
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Thu, 18 Feb 2010 20:47:12 +0100 |
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