Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy-move-merge @ 5417:b8872655f951
hgk: allow any extdiff command for visual diff
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Mon, 08 Oct 2007 11:18:34 +0800 |
parents | 8d9bdcbb2b18 |
children |
line wrap: on
line source
#!/bin/sh mkdir t cd t hg init echo 1 > a hg ci -qAm "first" -d "1000000 0" hg cp a b hg mv a c echo 2 >> b echo 2 >> c hg ci -qAm "second" -d "1000000 0" hg co -C 0 echo 0 > a echo 1 >> a hg ci -qAm "other" -d "1000000 0" hg merge --debug echo "-- b --" cat b echo "-- c --" cat c