merge with other head by default, not tip.
fixes issue 339.
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