t / t5100 / info0009on commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Author: F U Bar
   2Email: f.u.bar@example.com
   3Subject: updates
   4Date: Mon, 17 Sep 2001 00:00:00 +0900
   5