Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-copy-move-merge @ 5474:5d8f5ad45c12
Added signature for changeset 23889160905a1b09fffe1c07378e9fc1827606eb
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 19 Oct 2007 18:25:28 -0500 |
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