RelNoteson commit Fix bit assignment for CE_CONFLICTED (bf96c93)
   1Documentation/RelNotes-1.6.6.txt