Test conflict gets written to working copy
Test conflict gets written to working copy
pirafrank/gitlet,pirafrank/gitlet,maryrosecook/gitlet,pysnow530/gitlet,maryrosecook/gitlet,harrytruong/gitlet,harrytruong/gitlet