tests/test-merge4
author Brendan Cully <brendan@kublai.com>
Tue, 29 Aug 2006 17:08:55 -0700
changeset 3027 a4374f7331e4
parent 2283 e506c14382fd
permissions -rwxr-xr-x
Call patch.diff directly instead of printdiff - this also saves an extra walk of the working directory.

#!/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"