Mercurial > hg
view tests/test-copy-move-merge @ 8056:f614f11a96ca
Win32 installer: add hgrc.5.html and hgignore.5.html links to Start Menu folder
author | Pascal Quantin <pascal.quantin@gmail.com> |
---|---|
date | Sun, 25 Jan 2009 21:55:18 +0100 |
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