Merge branch 'jn/mailinfo-scissors'
commitd6b5af6d7636979220bc36872eeeebea15b2ad22
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 22:34:06 +0000 (7 15:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Apr 2010 22:34:06 +0000 (7 15:34 -0700)
tree66feaa9e753e342d1ee8fed29edae84536d68d2e
parente3af3cfc401420242a4a8873405f62e1aee5355b
parent9974e290e7c207de569ee24356253a69e5955e67
Merge branch 'jn/mailinfo-scissors'

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