From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Jun 2008 06:45:41 +0000 (-0700)
Subject: Merge branch 'sb/am-tests'
X-Git-Tag: v1.5.6-rc1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06f60e8edf1eb3a91e1af6f255bf46154168dd86;p=git.git

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
---

06f60e8edf1eb3a91e1af6f255bf46154168dd86