Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 1636:7da32bb3d1d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
contrib: add Chris Mason's stand-alone diff tool This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Jan 2006 14:49:19 +1300
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source

#!/bin/sh

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