view tests/test-journal-exists @ 7821:9fe7e6acf525

merge: better error messages to lead users to hg update --clean to abandon merges. Fixes issue1533.
author Augie Fackler <durin42@gmail.com>
date Wed, 04 Mar 2009 13:06:16 -0600
parents b6d8972ce339
children c40a1ee20aa5
line wrap: on
line source

#!/bin/sh

hg init
echo a > a
hg ci -Am0

touch .hg/store/journal

echo foo > a
hg ci -Am0

hg recover