t / t5100 / info0014on commit cherry-pick/revert: add scissors line on merge conflict (1a2b985)
   1Author: Junio Hamano
   2Email: junkio@cox.net
   3Subject: BLAH ONE
   4Date: Thu, 20 Aug 2009 17:18:22 -0700
   5