Mercurial > hg > pyhgsh
view tests/test-merge4 @ 2385:5d895018ef42
The line used to ignore the setup file for win32 is a regexp but it was after a "syntax: glob"
author | Marco Barisione <marco@barisione.org> |
---|---|
date | Mon, 22 May 2006 16:47:40 +0200 |
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"