Mercurial > hg
view tests/test-merge4 @ 10485:677fee0a0604 stable
hgrc.5: document use of environment variables on Windows
This feature was introduced in c31ac3f7fd8f
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 15 Feb 2010 20:28:42 -0600 |
parents | e506c14382fd |
children |
line wrap: on
line source
#!/bin/sh hg init echo This is file a1 > a hg add a hg commit -m "commit #0" -d "1000000 0" echo This is file b1 > b hg add b hg commit -m "commit #1" -d "1000000 0" hg update 0 echo This is file c1 > c hg add c hg commit -m "commit #2" -d "1000000 0" hg merge 1 rm b echo This is file c22 > c hg commit -m "commit #3" -d "1000000 0"