Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-basic @ 1664:4338e33c973b
Safer version of FileMerge merge
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 30 Jan 2006 12:02:12 +1300 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo a > a hg add a hg commit -m test -d "0 0" hg history hg manifest hg cat a hg verify