Mercurial > hg > gitweb
view tests/simple-merge @ 119:c7a66f9752a4
Add code to retrieve or construct a revlog delta
author | mpm@selenic.com |
---|---|
date | Fri, 20 May 2005 17:40:24 -0800 |
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