diff options
| author |  Stephen P. Smith <ischis2@cox.net> | 2018-10-22 20:53:37 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-23 14:15:09 +0900 |
| commit | b684062f889ae71f5887d04788b7c5d2afba720e (patch) | |
| tree | b75e0e4d64b43c7b5d8b22b171e86c8fc0d696de /Documentation/git-merge.txt | |
| parent | Fifth batch for 2.20 (diff) | |
| download | tgif-b684062f889ae71f5887d04788b7c5d2afba720e.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions