view tests/test-empty @ 3407: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 2b77ea66fe70
children
line wrap: on
line source

#!/bin/sh

hg init
hg log
hg grep wah
hg manifest
hg verify