view tests/test-merge4 @ 3179:76ab39df0917

gitweb: cosmetic fixes. Fix the padding around the changelog description. Alternate row colours for the changeset file list.
author Brendan Cully <brendan@kublai.com>
date Wed, 27 Sep 2006 12:08:33 -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"