Adjusted test output to changed abort message of 'hg merge' (from 0229ff95faec)
Is there an error message when trying to diff non-existing files?found: No such file or directorynot: No such file or directoryIs there an error message when trying to add non-existing files?found: No such file or directorynot: No such file or directory