Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh
authorStephan Beyer <s-beyer@gmx.net>
Sat, 31 May 2008 22:11:43 +0000 (00:11 +0200)
committerJunio C Hamano <gitster@pobox.com>
Sat, 31 May 2008 22:42:12 +0000 (15:42 -0700)
commit8ec00d0534c28763ed07533920daa47baca0d6a6
tree61b65d489cf912297a6ca245eb219eb073226812
parentd3a7b8f5c5ed2a073936e09aa80c8a0b0cf10f5c
Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.sh

This patch moves the am test cases in t4150-am.sh and the
am subdirectory test cases from t/t4150-am-subdir.sh into
t/4151-am.sh.

Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4150-am-subdir.sh [deleted file]
t/t4150-am.sh [moved from t/t4151-am.sh with 90% similarity]