Shorten message
Shorten message
Use same error message for undef hash and non-commit hash
Add todo
Add todo
No need to check all conflict merge content for presence

* Only check base - will have no base if file was added in both commits but with different content