tests/test-merge3

Improvement to 14ce129cfcd: Use try/except and pass filename on errors

Without the second part, the error message would be
  abort: Is a directory
instead of
  abort: Is a directory: /home/user/.cvspass

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
touch b
hg add b
rm b
hg commit -A -m"comment #1" -d "1000000 0"