#!/bin/sh HG=${HG:-hg} $HG init repo cd repo echo a > a $HG ci -qAm 'add a' echo b > b $HG ci -qAm 'add b' $HG up -qC 0 $HG rm a $HG ci -m 'rm a' $HG up -qC 1 rm a $HG st $HG --debug merge echo % should show a as removed $HG st hg ci -m merge echo % manifest. should not have a: hg manifest