aboutsummaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
Commit message (Collapse)AuthorAge
* fix whitespace violations in test scriptsJeff King2008-06-14
| | | | | | | | | These violations are simply wrong, but were never caught because whitespace policy checking is turned off in the test scripts. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge t4150-am-subdir.sh and t4151-am.sh into t4150-am.shStephan Beyer2008-05-31
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>