]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c4df23f) | patch
t2000: rename and combine checkout clash tests
authorStephen P. Smith <ischis2@cox.net>
Tue, 23 Oct 2018 03:53:37 +0000 (20:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Oct 2018 05:15:09 +0000 (14:15 +0900)
commitb684062f889ae71f5887d04788b7c5d2afba720e
treeb75e0e4d64b43c7b5d8b22b171e86c8fc0d696detree | snapshot
parentc4df23f7927d8d00e666a3c8d1b3375f1dc8a3c1commit | diff
t2000: rename and combine checkout clash tests

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>
t/t2000-checkout-cache-clash.sh [deleted file] blob | blame | history
t/t2000-conflict-when-checking-files-out.sh [new file with mode: 0755] blob
t/t2001-checkout-cache-clash.sh [deleted file] blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.