view tests/test-basic @ 3400:d2b55e3c4e25

merge: if filemerge skips merge, report as updated
author Matt Mackall <mpm@selenic.com>
date Sun, 15 Oct 2006 16:18:09 -0500
parents 7544700fd931
children ad3d5b4367cb
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m test -d "1000000 0"
hg history
hg manifest
hg cat a
hg verify