Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-remove @ 1664:4338e33c973b
Safer version of FileMerge merge
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Jan 2006 12:02:12 +1300 |
parents | 6a104941d56a |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh hg init a cd a echo a > foo hg add foo hg commit -m 1 -d "0 0" rm foo hg remove foo hg commit -m 2 -d "0 0" hg export 0 hg export 1 hg log -p -r 0 hg log -p -r 1 cd .. hg clone a b