tests/test-issue436

convert: svn merges produce hard-to-trace file entries. Ignore them for now.

#!/bin/sh

hg init a
cd a
hg -v log -v
hg -v log -v x
true