Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge3 @ 2889:57b88b86a845
Replace qdel/qfold -f option with -k/--keep.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 14 Aug 2006 11:24:19 -0700 |
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"