Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 3760:aeafd80c1e78
small fixes for test-newbranch
- hg tip doesn't use the branch cache; use hg log -r in its place
- commit doesn't use a HG_MERGE environment variable
- change the dates from "0 0" to "1000000 0"
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 02 Dec 2006 03:16:17 -0200 |
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"