Merge branch 'jn/mailinfo-scissors' into next
commit366435a0bb59764554ba81dc4e5bf72f590ab33b
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Apr 2010 07:11:34 +0000 (5 00:11 -0700)
tree9d12cb3d39d1fa597b021a00d7cb7558f21a2814
parent5b5e5797f3153ca83626fea519dc9b481c65c508
parent9974e290e7c207de569ee24356253a69e5955e67
Merge branch 'jn/mailinfo-scissors' into next

* jn/mailinfo-scissors:
  Teach mailinfo %< as an alternative scissors mark