t / t5100 / info0014on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Author: Junio Hamano
   2Email: junkio@cox.net
   3Subject: BLAH ONE
   4Date: Thu, 20 Aug 2009 17:18:22 -0700
   5