debian / compaton commit merge-one-file: leave unmerged index entries upon automerge failure. (354b9b5)
   14