Mercurial > hg > gitweb

view tests/test-merge4 @ 3078:baa3873eb387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't let lazyparser read more data than it can handle This should fix issue368.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Sep 2006 19:15:08 -0300
parents e506c14382fd
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"