There are a few things in git that I haven't seen in other SCMs before I got working with git. Some are probably because I haven't studied existing systems, but some are quite cool inventions that happened in our project, and I have grown to be quite fond of them: merge-recursive is an invention of Fredrik Kuivinen. When you have a criss-cross merge topology, the result of 3-way merge becomes amb

