summaryrefslogtreecommitdiff
path: root/t/t2000-conflict-when-checking-files-out.sh
AgeCommit message (Collapse)AuthorFilesLines
2018-10-23t2000: rename and combine checkout clash testsLibravatar Stephen P. Smith1-0/+135
In an earlier patch some tests scripts were renamed and a naming convention was documented. [1] Merge t2000-checkout-cache-clash.sh and t2001-checkout-cache-clash.sh into t2000-conflict-when-checking-files-out.sh. [1] f50c9f76c ("Rename some test scripts and describe the naming convention", 2005-05-15) Signed-off-by: Stephen P. Smith <ischis2@cox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>