Correct comment about when base written to index in conflict
Correct comment about when base written to index in conflict
pysnow530/gitlet,harrytruong/gitlet,pirafrank/gitlet,pirafrank/gitlet,harrytruong/gitlet,maryrosecook/gitlet,maryrosecook/gitlet