Merge branch 'jc/am'
authorJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:20:02 +0000 (18:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 18 Sep 2006 01:20:02 +0000 (18:20 -0700)
commit2874172101600666d30ceae92d27025849509066
tree1fcd1bdfed9a643b2d87e373cbbfc56a29eabcca
parentb467fb0b909883f28c4653361ccfa530ccf1a03e
parentc95b138985186992b222321f332cf92edbbd4141
Merge branch 'jc/am'

* jc/am:
  Fix git-am safety checks