edit conflict resolution is important

This wasn't an issue for me before, so I've been putting it off, but now I had the first edit conflict, and it has to be handled.

Currently Hatta doesn't check for edit conflicts – the last edit wins. There is place left for it in the code, but I never thought it's so important.

Now Hatta detects edit conflicts and attempts to merge the conflicting versions using Mercurial's internal mechanisms. The file is branched for one revision and immediately merged back, then additional revision is added.

Issues