Feature spec for aborting after merge conflicts
better uncommitted file handling