Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 4896:ee04732fe61d
merge with crew-stable
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 17 Jul 2007 09:28:01 -0300 |
parents | 7544700fd931 |
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" touch b hg add b rm b hg commit -A -m"comment #1" -d "1000000 0"