Moved the 'Commit aborted' message to the top
Tell the user if she already marked as resolved the file
kendall.0.1