Mercurial > hg > pyhgsh

view tests/test-merge4 @ 2307:5b3a3e35f084

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add section for configuration notes with initial note about the default editor
author Lee Cantey <lcantey@gmail.com>
date Thu, 18 May 2006 10:09:16 -0700
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"