In the .git folder, I have multiple of these files:

    FETCH_HEAD
    FETCH_HEAD (mba's conflicted copy 2012-05-30 (1))
    FETCH_HEAD (mba's conflicted copy 2012-05-30 (2))
    FETCH_HEAD (mba's conflicted copy 2012-05-30 (3))
    FETCH_HEAD (mba's conflicted copy 2012-05-30 (4))
    index
    index (mba's conflicted copy 2012-05-30 (1))
    index (mba's conflicted copy 2012-05-30 (2))
    index (osyMac's conflicted copy 2012-05-30 (2))
    index (osyMac's conflicted copy 2012-05-30 (3))
    index (osyMac's conflicted copy 2012-05-30 (4))