It's been a while since i posted last but i fixed some merging bugs... I dont know why they happened but i guess it is because i suck. I should not have committed this stuff before properly trying if it was safe to commit.
Things i fixed are like:
* proper handling of the exit status (diff can return 2 (trouble according to the man and info pages) and there are still differences)
* removed some unneccessary files
This week I also fixed some compiler warnings about using deprecated methods.