fixed merge operation. It required commit when aborting, which is not actually needed
Merge pull request #501 from volaya/merge-abort

fixed merge operation. It required commit when aborting.