Mercurial > hg
view tests/test-copy-move-merge @ 9501:6b3f9b3686ef
i18n-da: translate addremove, branch, and cat
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 28 Sep 2009 00:23:44 +0200 |
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