Mercurial > hg > mercurial-crew-with-dirclash
view tests/simple-merge @ 152:67b8d24d2dbe
hgweb is no longer a script
author | jake@edge2.net |
---|---|
date | Tue, 24 May 2005 07:33:12 -0700 |
parents | 9f64ee817199 |
children |
line wrap: on
line source
set -ex export EDITOR=true rm -rf test branch mkdir test cd test echo foo>foo hg init hg addremove hg commit hg verify cd .. cp -a test branch cd branch echo bar>>foo hg commit cd ../test hg merge ../branch hg verify