Mercurial > hg > gitweb

view tests/test-merge4 @ 3181:3637d5d17cbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Documentation fixes for addremove. - It is no longer deprecated, but the short help still included (DEPRECATED). - Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 27 Sep 2006 21:43:45 +0200
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"