Merge branch 'sb/am-tests'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Jun 2008 06:45:41 +0000 (23:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Jun 2008 06:45:41 +0000 (23:45 -0700)
commit06f60e8edf1eb3a91e1af6f255bf46154168dd86
treed5d04952db8a808176349d85f60c4c4b87d42ff7
parentf0d2a057c1f8c1f425a81888bc9fd3fbca29bf99
parent8ec00d0534c28763ed07533920daa47baca0d6a6
Merge branch 'sb/am-tests'

* sb/am-tests:
  Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
  Add test cases for git-am