Merge branch 'ss/rename-tests'
[git] / t / t2000-conflict-when-checking-files-out.sh
2018-10-30  Junio C HamanoMerge branch 'ss/rename-tests'
2018-10-23  Stephen P. Smitht2000: rename and combine checkout clash tests