() Stefan Monnier <monnier@iro.umontreal.ca>
() Wed, 27 Nov 2013 15:46:59 -0500

   For three-way merges, the 3rd is called "BASE" in smerge, which makes
   sense, no matter how you get that result.  Using A/B/Base is not great
   because of the conflicting first letter of B and Base.
   Maybe we could go with X/Y/Base?

You can also think of A/B/Common, in which case C is fine.
That's what i do.

-- 
Thien-Thi Nguyen
   GPG key: 4C807502
   (if you're human and you know it)
      read my lisp: (responsep (questions 'technical)
                               (not (via 'mailing-list)))
                     => nil