[anamexis]

> original file, version A, version B, merged result

Isn't one of version A or B the original file? What am I missing?

[jrib]

http://psung.blogspot.com/2011/02/reducing-merge-headaches-g...

This is a good discussion on the topic including the diff3 option git has.

[rubyist5eva]

the "original" file is the common ancestor of version A and version B

[rdiddly]

In a merge conflict versions A & B would tend to be different changes made to the original, usually made by different people.